diff --git a/language/predefined/variables/argc.xml b/language/predefined/variables/argc.xml
index 0ed130935a..a137a447c4 100644
--- a/language/predefined/variables/argc.xml
+++ b/language/predefined/variables/argc.xml
@@ -51,6 +51,25 @@ int(4)
    </example>
   </para>
  </refsect1>
+
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    This is also available as <varname>$_SERVER['argc']</varname>. 
+   </para>
+  </note>
+ </refsect1>
+
+<refsect1 role="seealso">
+  &reftitle.seealso;
+  <para>
+   <simplelist>
+    <member><function>getopt</function></member>
+    <member><link linkend="reserved.variables.argv"><varname>$argv</varname></link></member>
+   </simplelist>
+  </para>
+ </refsect1>
  
 </phpdoc:varentry>
  
diff --git a/language/predefined/variables/argv.xml b/language/predefined/variables/argv.xml
index 0d61cbd9c6..9b9fa64652 100644
--- a/language/predefined/variables/argv.xml
+++ b/language/predefined/variables/argv.xml
@@ -60,12 +60,22 @@ array(4) {
    </example>
   </para>
  </refsect1>
- 
+
+ <refsect1 role="notes">
+  &reftitle.notes;
+  <note>
+   <para>
+    This is also available as <varname>$_SERVER['argv']</varname>. 
+   </para>
+  </note>
+ </refsect1>
+  
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
    <simplelist>
     <member><function>getopt</function></member>
+    <member><link linkend="reserved.variables.argc"><varname>$argc</varname></link></member>
    </simplelist>
   </para>
  </refsect1>