diff --git a/ChangeLog b/ChangeLog
index 6fed5f6e3..97e054432 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,10 +6,11 @@
 
 ==== Core ====
   * Fix saving torrent state on fresh configs
-  
+
 ==== Web ====
-  * Fix changing of the allocation in the preferences.
-  * Fix updating the Connection Manager when a host is added.
+	* Fix changing of the allocation in the preferences.
+	* Fix updating the Connection Manager when a host is added.
+	* Add a --fork option to allow forking the webui to the background
 
 ==== Misc ====
   * Add man pages for deluge-console and deluge-gtk
diff --git a/deluge/ui/web/web.py b/deluge/ui/web/web.py
index 4347b983b..b5fd20815 100644
--- a/deluge/ui/web/web.py
+++ b/deluge/ui/web/web.py
@@ -33,6 +33,8 @@
 #
 #
 
+import os
+
 from deluge.ui.ui import _UI, UI
 from optparse import OptionGroup
 
@@ -51,6 +53,9 @@ class Web(_UI):
         self.__server =  None
         
         group = OptionGroup(self.parser, "Web Options")
+        group.add_option("-f", "--fork", dest="fork",
+            help="Fork the web interface process into the background",
+            action="store_true", default=False)
         group.add_option("-p", "--port", dest="port", type="int",
             help="Sets the port to be used for the webserver",
             action="store", default=None)
@@ -72,6 +77,11 @@ class Web(_UI):
     def start(self):
         super(Web, self).start()
         
+        if self.options.fork:
+            if os.fork():
+                exit(0)
+            
+        
         import server
         self.__server = server.DelugeWeb()