diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index bbfb58e69a2d374e7282b399b01d107cbc365b4e..106e819b479f03afa2615435a68e7589956a7fe6 100644
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.24 2009/06/18 10:08:08 heikki Exp $
+ * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.25 2009/06/25 12:03:10 heikki Exp $
  *
  *
  * pg_standby.c
@@ -523,7 +523,7 @@ usage(void)
 	printf("  -d                 generate lots of debugging output (testing only)\n");
 	printf("  -k NUMFILESTOKEEP  if RESTARTWALFILE not used, removes files prior to limit\n"
 		   "                     (0 keeps all)\n");
-	printf("  -l                 links into archive (leaves file in archive)\n");
+	printf("  -l                 does nothing; use of link is now deprecated\n");
 	printf("  -r MAXRETRIES      max number of times to retry, with progressive wait\n"
 		   "                     (default=3)\n");
 	printf("  -s SLEEPTIME       seconds to wait between file checks (min=1, max=60,\n"
@@ -610,7 +610,12 @@ main(int argc, char **argv)
 				}
 				break;
 			case 'l':			/* Use link */
-				restoreCommandType = RESTORE_COMMAND_LINK;
+				/*
+				 * Link feature disabled, possibly permanently. Linking
+				 * causes a problem after recovery ends that is not currently
+				 * resolved by PostgreSQL. 25 Jun 2009
+					restoreCommandType = RESTORE_COMMAND_LINK;
+				*/
 				break;
 			case 'r':			/* Retries */
 				maxretries = atoi(optarg);
diff --git a/doc/src/sgml/pgstandby.sgml b/doc/src/sgml/pgstandby.sgml
index 87ba1fcad2e07370566e13e2fbf346717387c097..ce81de3a189ea15daa058f4e85277d538ede3bd5 100644
--- a/doc/src/sgml/pgstandby.sgml
+++ b/doc/src/sgml/pgstandby.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/pgstandby.sgml,v 2.9 2009/05/14 21:59:22 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/pgstandby.sgml,v 2.10 2009/06/25 12:03:11 heikki Exp $ -->
 
 <sect1 id="pgstandby">
  <title>pg_standby</title>
@@ -25,11 +25,6 @@
   <application>pg_standby</application> features include:
  </para>
  <itemizedlist>
-  <listitem>
-   <para>
-    Supports copy or link for restoring WAL files
-   </para>
-  </listitem>
   <listitem>
    <para>
     Written in C, so very portable and easy to install
@@ -171,23 +166,11 @@ pg_standby <optional> <replaceable>option</> ... </optional> <replaceable>archiv
        archive space.
       </entry>
      </row>
-     <row>
-      <entry><literal>-l</></entry>
-      <entry>no</entry>
-      <entry>
-       Use <literal>ln</> command to restore WAL files from archive.
-       Link is more efficient than copy, but the default is copy since link
-       will not work in all scenarios.
-       On Windows, this option uses the <literal>mklink</> command
-       to provide a file-to-file symbolic link. <literal>-l</> will
-       not work on versions of Windows prior to Vista.
-      </entry>
-     </row>
      <row>
       <entry><literal>-r</> <replaceable>maxretries</></entry>
       <entry>3</entry>
       <entry>
-        Set the maximum number of times to retry the copy or link command if it
+        Set the maximum number of times to retry the copy command if it
         fails. After each failure, we wait for <replaceable>sleeptime</> *
         <replaceable>num_retries</>
         so that the wait time increases progressively.  So by default,
@@ -242,7 +225,7 @@ pg_standby <optional> <replaceable>option</> ... </optional> <replaceable>archiv
   <programlisting>
 archive_command = 'cp %p .../archive/%f'
 
-restore_command = 'pg_standby -l -d -s 2 -t /tmp/pgsql.trigger.5442 .../archive %f %p %r 2>>standby.log'
+restore_command = 'pg_standby -d -s 2 -t /tmp/pgsql.trigger.5442 .../archive %f %p %r 2>>standby.log'
 
 recovery_end_command = 'rm -f /tmp/pgsql.trigger.5442'
   </programlisting>
@@ -253,11 +236,6 @@ recovery_end_command = 'rm -f /tmp/pgsql.trigger.5442'
    This will:
   </para>
   <itemizedlist>
-   <listitem>
-    <para>
-     use the <literal>ln</> command to restore WAL files from archive
-    </para>
-   </listitem>
    <listitem>
     <para>
      produce debugging output in <filename>standby.log</>