diff --git a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
index 9f2c290e5..5f8442d0c 100644
--- a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
@@ -31,7 +31,6 @@
 import net.java.sip.communicator.impl.gui.utils.Constants;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.service.gui.ContactList;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.gui.event.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -1201,15 +1200,9 @@ public void beginShutdown()
         }
         finally
         {
-            try
-            {
-                GuiActivator.bundleContext.getBundle(0).stop();
-            }
-            catch (BundleException ex)
-            {
-                logger.error("Failed to being gentle shutdown of Felix.", ex);
-                System.exit(0);
-            }
+            // Just exit. The shutdown hook in felix ensures that we stop
+            // everything nicely.
+            System.exit(0);
         }
     }
 
diff --git a/src/net/java/sip/communicator/impl/shutdowntimeout/ShutdownTimeout.java b/src/net/java/sip/communicator/impl/shutdowntimeout/ShutdownTimeout.java
index e221c0fc1..22bc36106 100644
--- a/src/net/java/sip/communicator/impl/shutdowntimeout/ShutdownTimeout.java
+++ b/src/net/java/sip/communicator/impl/shutdowntimeout/ShutdownTimeout.java
@@ -109,7 +109,7 @@ public void run()
                                      + shutDownTimeout + "ms.");
                         wait(shutDownTimeout);
                         logger.error("Failed to gently shutdown. Forcing exit.");
-                        System.exit(SYSTEM_EXIT_CODE);
+                        Runtime.getRuntime().halt(SYSTEM_EXIT_CODE);
                     }catch (InterruptedException ex){
                         if (logger.isDebugEnabled())
                             logger.debug("Interrupted shutdown timer.");