diff --git a/ChangeLog b/ChangeLog
index 89187a571..32d0b8f45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,7 @@
 ==== Core ====
 	* Fix the upload_plugin rpc method (was still using XML-RPC stuff)
 	* Fix possible exception when upgrading from a 0.5 state file
+	* Use metavar to modify the help output by optparse.
 
 === Deluge 1.2.0_rc4 (24 November 2009) ===
 ==== Core ====
diff --git a/deluge/main.py b/deluge/main.py
index 2a40d1505..e4da139c1 100644
--- a/deluge/main.py
+++ b/deluge/main.py
@@ -135,11 +135,11 @@ def start_daemon():
         help="Port daemon will listen on", action="store", type="int")
     parser.add_option("-i", "--interface", dest="interface",
         help="Interface daemon will listen for bittorrent connections on, \
-this should be an IP address",
+this should be an IP address", metavar="IFACE",
         action="store", type="str")
     parser.add_option("-u", "--ui-interface", dest="ui_interface",
         help="Interface daemon will listen for UI connections on, this should be\
- an IP address", action="store", type="str")
+ an IP address", metavar="IFACE", action="store", type="str")
     parser.add_option("-d", "--do-not-daemonize", dest="donot",
         help="Do not daemonize", action="store_true", default=False)
     parser.add_option("-c", "--config", dest="config",