diff --git a/libagent/gpg/__init__.py b/libagent/gpg/__init__.py
index 6e73d4c..ee544ff 100644
--- a/libagent/gpg/__init__.py
+++ b/libagent/gpg/__init__.py
@@ -11,6 +11,7 @@ See these links for more details:
 import argparse
 import contextlib
 import functools
+import pkg_resources
 import logging
 import os
 import re
@@ -252,5 +253,9 @@ def main(device_type):
     p.add_argument('-v', '--verbose', default=0, action='count')
     p.set_defaults(func=run_unlock)
 
+    version = pkg_resources.require("trezor-agent")[0].version
+    parser.add_argument('--version', help='Print the version info',
+                        action='version', version='%(prog)s ' + version)
+
     args = parser.parse_args()
     return args.func(device_type=device_type, args=args)
diff --git a/libagent/ssh/__init__.py b/libagent/ssh/__init__.py
index e5dc38d..99711e0 100644
--- a/libagent/ssh/__init__.py
+++ b/libagent/ssh/__init__.py
@@ -4,6 +4,7 @@ import functools
 import io
 import logging
 import os
+import pkg_resources
 import re
 import subprocess
 import sys
@@ -60,6 +61,10 @@ def create_agent_parser():
     p = configargparse.ArgParser(default_config_files=['~/.ssh/agent.config'])
     p.add_argument('-v', '--verbose', default=0, action='count')
 
+    version = pkg_resources.require("trezor-agent")[0].version
+    p.add_argument('--version', help='Print the version info',
+                   action='version', version='%(prog)s ' + version)
+
     curve_names = [name for name in formats.SUPPORTED_CURVES]
     curve_names = ', '.join(sorted(curve_names))
     p.add_argument('-e', '--ecdsa-curve-name', metavar='CURVE',