diff --git a/TODO.txt b/TODO.txt
index 8a030fe5c..5203ef692 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,21 +4,16 @@ Last milestone reached: Restart client app without restarting BTdaemon possible
 
 NEXT:
 - autostart by launchd: ch.ringwald.BTstack.plist
-  - provide SIGTERM handler
-  - Unix Socket example Mac: http://lists.apple.com/archives/Macnetworkprog/2007/Oct/msg00078.html
-  - Mac OS X book: 472-485
-  - check with launchd, too?
-    - launch.h exists in 3.0 SDK, but also in inofficial headers before
-- stop  BTdaemon after X minutes idle
+  - get to work
+- better deal with Apple stack
+  - detect that it is running
+  - figure out how to shut it down
+  - user interface
 - iPhone status icon support
   - set BTstack SpringBoard icon from background deamon
     - possible without MobileSubstrate
 	- MobileSubstrate used by veency
 - extend hci_logger to write to /var/hci_dump.txt as text
-- better deal with Apple stack
-  - detect that it is running
-  - figure out how to shut it down
-  - user interface
 - Cocoa User Interface Components
   - Alert and shutdown of Apple's stack
   - Inquiry
diff --git a/src/daemon.c b/src/daemon.c
index 76ac831e6..75a6e6726 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -52,8 +52,9 @@ static void dummy_bluetooth_status_handler(BLUETOOTH_STATE state){
 static void (*bluetooth_status_handler)(BLUETOOTH_STATE state) = dummy_bluetooth_status_handler;
 
 static void daemon_no_connections_timeout(){
-    printf("No connection for %u seconds -> POWER OFF\n", DAEMON_NO_CONNECTION_TIMEOUT);
+    printf("No connection for %u seconds -> POWER OFF and quit\n", DAEMON_NO_CONNECTION_TIMEOUT);
     hci_power_control( HCI_POWER_OFF);
+    exit(0);
 }
 
 static int btstack_command_handler(connection_t *connection, uint8_t *packet, uint16_t size){