diff --git a/src/helma/main/HelmaShutdownHook.java b/src/helma/main/HelmaShutdownHook.java
index ee399727..1c0d83f1 100644
--- a/src/helma/main/HelmaShutdownHook.java
+++ b/src/helma/main/HelmaShutdownHook.java
@@ -1,6 +1,9 @@
 // HelmaShutdownHook.java
 package helma.main;
 
+import helma.util.Logger;
+import java.util.List;
+
 /**
  * ShutdownHook that shuts down all running Helma applications on exit.
  */
@@ -13,8 +16,15 @@ public class HelmaShutdownHook extends Thread {
     }
 
     public void run () {
-	System.err.print ("Shutting down Helma...");
-	System.err.println ("done");
+	Logger logger = Server.getLogger();
+	if (logger != null)
+	    logger.log ("Shutting down Helma");
+	appmgr.stopAll ();
+	List loggers = Logger.getLoggers();
+	int l = loggers.size();
+	for (int i=0; i<l; i++)
+	    ((Logger) loggers.get(i)).close();
+	Logger.wakeup();
     }
 
 }