diff --git a/src/gajim.py b/src/gajim.py
index 59c39d75e..003e7a9e8 100644
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -122,7 +122,7 @@ def parseOpts():
     try:
         shortargs = 'hqvl:p:c:'
         # add gtk/gnome session option as gtk_get_option_group is not wrapped
-        longargs = 'help quiet verbose loglevel= profile= config_path='
+        longargs = 'help quiet verbose loglevel= profile= config-path='
         longargs += ' class= name= screen= gtk-module= sync g-fatal-warnings'
         longargs += ' sm-client-id= sm-client-state-file= sm-disable'
         opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0]
diff --git a/src/history_manager.py b/src/history_manager.py
index ef6cf698d..fb7115b41 100644
--- a/src/history_manager.py
+++ b/src/history_manager.py
@@ -62,7 +62,7 @@ def parseOpts():
 
     try:
         shortargs = 'hc:'
-        longargs = 'help config_path='
+        longargs = 'help config-path='
         opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0]
     except getopt.error, msg:
         print str(msg)