diff --git a/doc/src/sgml/ref/ecpg-ref.sgml b/doc/src/sgml/ref/ecpg-ref.sgml
index df3c1054f0..f3b6034f42 100644
--- a/doc/src/sgml/ref/ecpg-ref.sgml
+++ b/doc/src/sgml/ref/ecpg-ref.sgml
@@ -41,14 +41,21 @@ PostgreSQL documentation
 
   <para>
    <command>ecpg</command> will convert each input file given on the
-   command line to the corresponding C output file.  Input files
-   preferably have the extension <filename>.pgc</filename>.
-   The extension will be replaced by <filename>.c</filename> to
-   determine the output file name.
-   The output file name can also be overridden using the
+   command line to the corresponding C output file.  If an input file
+   name does not have any extension, <filename>.pgc</filename> is
+   assumed.  The file's extension will be replaced
+   by <filename>.c</filename> to construct the output file name.
+   But the output file name can be overridden using the
    <option>-o</option> option.
   </para>
 
+  <para>
+   If an input file name is just <literal>-</literal>,
+   <command>ecpg</command> reads the program from standard input
+   (and writes to standard output, unless that is overridden
+   with <option>-o</option>).
+  </para>
+
   <para>
    This reference page does not describe the embedded SQL language.
    See <xref linkend="ecpg"/> for more information on that topic.
@@ -94,6 +101,19 @@ PostgreSQL documentation
      </listitem>
     </varlistentry>
 
+    <varlistentry>
+     <term><option>-h</option></term>
+     <listitem>
+      <para>
+       Process header files.  When this option is specified, the output file
+       extension becomes <literal>.h</literal> not <literal>.c</literal>,
+       and the default input file extension is <literal>.pgh</literal>
+       not <literal>.pgc</literal>.  Also, the <option>-c</option> option is
+       forced on.
+      </para>
+     </listitem>
+    </varlistentry>
+
     <varlistentry>
      <term><option>-i</option></term>
      <listitem>
@@ -125,6 +145,7 @@ PostgreSQL documentation
       <para>
        Specifies that <command>ecpg</command> should write all
        its output to the given <replaceable>filename</replaceable>.
+       Write <literal>-o -</literal> to send all output to standard output.
       </para>
      </listitem>
     </varlistentry>
diff --git a/src/port/getopt_long.c b/src/port/getopt_long.c
index ff379db29b..c989276988 100644
--- a/src/port/getopt_long.c
+++ b/src/port/getopt_long.c
@@ -79,14 +79,22 @@ getopt_long(int argc, char *const argv[],
 
 		place++;
 
-		if (place[0] && place[0] == '-' && place[1] == '\0')
-		{						/* found "--" */
+		if (!*place)
+		{
+			/* treat "-" as not being an option */
+			place = EMSG;
+			return -1;
+		}
+
+		if (place[0] == '-' && place[1] == '\0')
+		{
+			/* found "--", treat it as end of options */
 			++optind;
 			place = EMSG;
 			return -1;
 		}
 
-		if (place[0] && place[0] == '-' && place[1])
+		if (place[0] == '-' && place[1])
 		{
 			/* long option */
 			size_t		namelen;