diff --git a/src/gajim-remote.py b/src/gajim-remote.py
index 154a70fd4..82ec20ad2 100644
--- a/src/gajim-remote.py
+++ b/src/gajim-remote.py
@@ -439,7 +439,8 @@ class GajimRemote:
         """
         Print usage, and list available commands
         """
-        s = _('Usage: %s command [arguments]\nCommand is one of:\n' ) % BASENAME
+        s = _('Usage:\n  %s command [arguments]\n\nCommand is one of:\n' ) % (
+            BASENAME)
         for command in sorted(self.commands):
             s += '  ' + command
             for arg in self.commands[command][1]:
diff --git a/src/history_manager.py b/src/history_manager.py
index 32fb73dde..a812c15c6 100644
--- a/src/history_manager.py
+++ b/src/history_manager.py
@@ -71,7 +71,12 @@ def parseOpts():
         sys.exit(2)
     for o, a in opts:
         if o in ('-h', '--help'):
-            print('history_manager [--help] [--config-path]')
+            print(_('Usage:') + \
+                '\n  gajim-history-manager [options] filename\n\n' + \
+                _('Options:') + \
+                '\n  -h, --help         ' + \
+                    _('Show this help message and exit') + \
+                '\n  -c, --config-path  ' + _('Set logs directory'))
             sys.exit()
         elif o in ('-c', '--config-path'):
             config_path = a