diff --git a/VERSION.txt b/VERSION.txt
index 2fd42daba1c..10d3ac3bb54 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,5 +1,6 @@
 
  + 311154 Added deprecated StringBuffer API for backwards compatibility
+ + 311554 Protect shutdown thread from Server#doStop
 
 jetty-7.1.0.RC1-SNAPSHOT
  + 286889 Allow System and Server classes to be set on Server instance and when applied to all webapps
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
index e8f7dcff4cd..ce987837a13 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
@@ -308,7 +308,9 @@ public class Server extends HandlerWrapper implements Attributes
         }
        
         mex.ifExceptionThrow();
-        ShutdownThread.deregister(this);
+
+        if (getStopAtShutdown())
+            ShutdownThread.deregister(this);
     }
 
     /* ------------------------------------------------------------ */