diff --git a/Daemon.h b/Daemon.h
index efbd5df4..031686f7 100644
--- a/Daemon.h
+++ b/Daemon.h
@@ -50,26 +50,31 @@ namespace i2p
 
 			bool init(int argc, char* argv[]);
 			bool start();
-			bool stop();
+			bool stop();
 			void run ();
 		};
 #else
 		class DaemonLinux : public Daemon_Singleton
 		{
-		public:
-			static DaemonLinux& Instance()
-			{
-				static DaemonLinux instance;
-				return instance;
-			}
+			public:
+				static DaemonLinux& Instance()
+				{
+					static DaemonLinux instance;
+					return instance;
+				}
 
-			bool start();
-			bool stop();
-;			void run ();
+				bool start();
+				bool stop();
+				void run ();
+
+			private:
+
+				std::string pidfile;
+                int pidFH;
+
+			public:
 
-                private:
-                       std::string pidfile;
-                       int pidFH;
+				int gracefullShutdownInterval; // in seconds
 
 		};
 #endif
diff --git a/DaemonLinux.cpp b/DaemonLinux.cpp
index e760b4f5..d517ef79 100644
--- a/DaemonLinux.cpp
+++ b/DaemonLinux.cpp
@@ -17,14 +17,17 @@ void handle_signal(int sig)
 {
 	switch (sig)
 	{
-	case SIGHUP:
-		LogPrint(eLogInfo, "Daemon: Got SIGHUP, reopening log...");
-		i2p::log::Logger().Reopen ();
-	break;
-	case SIGABRT:
-	case SIGTERM:
-	case SIGINT:
-		Daemon.running = 0; // Exit loop
+		case SIGHUP:
+			LogPrint(eLogInfo, "Daemon: Got SIGHUP, reopening log...");
+			i2p::log::Logger().Reopen ();
+		break;
+		case SIGINT:
+			Daemon.gracefullShutdownInterval = 10*60; // 10 minutes
+			LogPrint(eLogInfo, "Graceful shutdown after ", Daemon.gracefullShutdownInterval, " seconds");
+		break;	
+		case SIGABRT:
+		case SIGTERM:
+			Daemon.running = 0; // Exit loop
 		break;
 	}
 }
@@ -96,6 +99,7 @@ namespace i2p
 					return false;
 				}
 			}
+			gracefullShutdownInterval = 0; // not specified
 
 			// Signal handler
 			struct sigaction sa;
@@ -122,6 +126,15 @@ namespace i2p
 			while (running)
 			{
 				std::this_thread::sleep_for (std::chrono::seconds(1));
+				if (gracefullShutdownInterval)
+				{
+					gracefullShutdownInterval--; // - 1 second
+					if (gracefullShutdownInterval <= 0) 
+					{	
+						LogPrint(eLogInfo, "Graceful shutdown");
+						return;
+					}
+				}	
 			}
 		}
 	}