diff --git a/tests/ChangeLog b/tests/ChangeLog
index f485f93c..757ed339 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-22  Micah Cowan  <micah@cowan.name>
+
+	* FTPServer.pm (run): Avoid re-forking. Fixes bug #20458.
+
 2008-04-26  Micah Cowan  <micah@cowan.name>
 
 	* Makefile.am, Test-proxied-https-auth.px: Added a test for
diff --git a/tests/FTPServer.pm b/tests/FTPServer.pm
index 7c7f3e58..d8ad8b0c 100644
--- a/tests/FTPServer.pm
+++ b/tests/FTPServer.pm
@@ -833,14 +833,14 @@ sub run
         print STDERR "got a connection from: $client_ipnum\n" if $log;
 
         # fork off a process to handle this connection.
-        my $pid = fork();
-        unless (defined $pid) {
-            warn "fork: $!";
-            sleep 5; # Back off in case system is overloaded.
-            next;
-        }
+        # my $pid = fork();
+        # unless (defined $pid) {
+        #     warn "fork: $!";
+        #     sleep 5; # Back off in case system is overloaded.
+        #     next;
+        # }
 
-        if ($pid == 0) { # Child process.
+        if (1) { # Child process.
 
             # install signals
             $SIG{URG}  = sub {