diff --git a/ChangeLog b/ChangeLog
index 9da422650..1e7272965 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
   * Fix #883 segfault if locale is not using UTF-8 encoding
   * Fix for adding torrents with invalid filename encodings
   * Fix displaying IPv6 peers in the Peers tab
+  * Fix starting the daemon in OS X
 
 === Deluge 1.1.6 - (06 April 2009) ===
 ==== Core ====
diff --git a/deluge/ui/gtkui/connectionmanager.py b/deluge/ui/gtkui/connectionmanager.py
index c3ec0a2d0..87360393f 100644
--- a/deluge/ui/gtkui/connectionmanager.py
+++ b/deluge/ui/gtkui/connectionmanager.py
@@ -491,6 +491,9 @@ class ConnectionManager(component.Component):
         # Spawn a local daemon
         if deluge.common.windows_check():
             win32api.WinExec("deluged -p %s" % port)
+        elif deluge.common.osx_check():
+            subprocess.call(["nohup", "deluged", "--port=%s" % port,
+                "--config=%s" % deluge.configmanager.get_config_dir()])
         else:
             subprocess.call(["deluged", "--port=%s" % port,
                 "--config=%s" % deluge.configmanager.get_config_dir()])