diff --git a/src/helma/main/Server.java b/src/helma/main/Server.java
index 9afa97b6..fa8fcae2 100644
--- a/src/helma/main/Server.java
+++ b/src/helma/main/Server.java
@@ -530,6 +530,14 @@ public class Server implements IPathElement, Runnable {
                 // http.stop() interrupted by another thread. ignore.
             }
         }
+
+        if (xmlrpc != null) {
+            try {
+                xmlrpc.shutdown();
+            } catch (Exception x) {
+                // exception in xmlrpc server shutdown, ignore.
+            }
+        }
         
         if (helmaLogging) {
             Logging.shutdown();
@@ -622,7 +630,7 @@ public class Server implements IPathElement, Runnable {
                             xmlrpc.acceptClient(st.nextToken());
                     }
                 }
-
+                xmlrpc.start();
                 logger.info("Starting XML-RPC server on port " + (xmlrpcPort));
             }