diff --git a/scm/xdocs/faq.fml b/scm/xdocs/faq.fml
new file mode 100644
index 00000000..c3fc8810
--- /dev/null
+++ b/scm/xdocs/faq.fml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<faqs title="Frequently Asked Questions">
+
+  <part id="general">
+    <title>General</title>
+
+    <faq id="non-default-port">
+      <question>How can I use a non default port in cvs pserver protocol?</question>
+      <answer>
+         You may use the vertical bar as delimiter in the repository
+         <a href="http://maven.apache.org/maven-1.x/reference/project-descriptor.html#class_Repository">connection</a>
+         element, if the repository contains a colon (:):
+         <source>scm|cvs|pserver|username@host:port|cvsroot|module</source>
+      </answer>
+    </faq>
+
+  </part>
+      
+
+
+  <!--
+    <faq id="">
+      <question></question>
+      <answer></answer>
+    </faq>
+  -->
+
+</faqs>
+   
diff --git a/scm/xdocs/index.xml b/scm/xdocs/index.xml
index ef5eb000..9c4a5c2b 100644
--- a/scm/xdocs/index.xml
+++ b/scm/xdocs/index.xml
@@ -35,7 +35,8 @@
         how to <a href="releasing.html">make project releases from SCM</a>.
       </p>
       <p>
-        A reference on the <a href="scmurl.html">SCM URL format</a> is also included.
+        Info about the <a href="http://maven.apache.org/scm/scm-url-format.html">SCM URL format</a>
+        used by this plugin can be found at the <a href="http://maven.apache.org/scm/">Maven SCM project</a>.
       </p>
       <p> 
         For a full reference of this plugins capabilities,