diff --git a/server/server.cpp b/server/server.cpp
index fa20be7..5d73549 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -29,12 +29,14 @@
   // Register to handle the signals that indicate when the server should exit.
   // It is safe to register for the same signal multiple times in a program,
   // provided all registration for the specified signal is made through Asio.
+  /*
   signals_.add(SIGINT);
   signals_.add(SIGTERM);
 #if defined(SIGQUIT)
   signals_.add(SIGQUIT);
 #endif // defined(SIGQUIT)
   signals_.async_wait(boost::bind(&server::handle_stop, this));
+  */
 
   // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
   boost::asio::ip::tcp::resolver resolver(io_service_);
@@ -50,6 +52,11 @@
   _LOG_DEBUG("Listen on [" << address << ": " << port << "] with doc_root = " << doc_root);
 }
 
+server::~server()
+{
+  handle_stop();
+}
+
 void server::run()
 {
   // The io_service::run() call will block until all asynchronous operations
diff --git a/server/server.hpp b/server/server.hpp
index 408f7b9..d6e50a9 100644
--- a/server/server.hpp
+++ b/server/server.hpp
@@ -34,10 +34,12 @@
   /// Run the server's io_service loop.
   void run();
 
+  ~server();
+
+private:
   /// Handle a request to stop the server.
   void handle_stop();
 
-private:
   /// Initiate an asynchronous accept operation.
   void start_accept();