diff --git a/daemon.py b/daemon.py
index 7013d71..55800c6 100644
--- a/daemon.py
+++ b/daemon.py
@@ -1,8 +1,6 @@
 """Generic linux daemon base class for python 3.x."""
 
 import sys, os, time, atexit, signal
-from watchdog.observers import Observer
-from watchdog.events import FileSystemEventHandler
 
 class Daemon:
 	"""A generic daemon class.
@@ -56,11 +54,6 @@ class Daemon:
 		pid = str(os.getpid())
 		with open(self.pidfile,'w+') as f:
 			f.write(pid + '\n')
-		
-		event_handler = MyHandler()
-		observer = Observer()
-		observer.schedule(event_handler, path='/usr/include', recursive=False)
-		observer.start()
 	
 	def delpid(self):
 		os.remove(self.pidfile)
diff --git a/h2incd.py b/h2incd.py
index 871cbd6..1e173d8 100644
--- a/h2incd.py
+++ b/h2incd.py
@@ -5,13 +5,21 @@ from watchdog.events import FileSystemEventHandler
 
 class h2incDaemon(Daemon):
 	def run(self):
-		while True:
-			time.sleep(1)
+		event_handler = MyHandler()
+		observer = Observer()
+		observer.schedule(event_handler, path='/usr/include', recursive=False)
+		observer.start()
+		try:
+			while True:
+				time.sleep(1)
+		except KeyboardInterrupt:
+			observer.stop()
+		observer.join()
 
 class MyHandler(FileSystemEventHandler):
     def on_modified(self, event):
         print(f'event type: {event.event_type}  path : {event.src_path}')
-		
+
 if __name__ == "__main__":
 	daemon = h2incDaemon('/tmp/h2inc-daemon.pid')
 	if len(sys.argv) == 2: