diff --git a/libagent/age/__init__.py b/libagent/age/__init__.py
index f13ce066..954f3bf0 100644
--- a/libagent/age/__init__.py
+++ b/libagent/age/__init__.py
@@ -18,7 +18,7 @@
 import traceback
 
 import bech32
-import pkg_resources
+from importlib import metadata
 import semver
 from cryptography.exceptions import InvalidTag
 from cryptography.hazmat.primitives.ciphers.aead import ChaCha20Poly1305
@@ -155,8 +155,8 @@ def main(device_type):
 
     agent_package = device_type.package_name()
     resources_map = {r.key: r for r in pkg_resources.require(agent_package)}
-    resources = [resources_map[agent_package], resources_map['lib-agent']]
-    versions = '\n'.join('{}={}'.format(r.key, r.version) for r in resources)
+    resources = [metadata.distribution(agent_package), metadata.distribution('lib-agent')]
+    versions = '\n'.join('{}={}'.format(r.metadata['Name'], r.version) for r in resources)
     p.add_argument('--version', help='print the version info',
                    action='version', version=versions)
 
diff --git a/libagent/gpg/__init__.py b/libagent/gpg/__init__.py
index 945cfd1f..6ac15e7c 100644
--- a/libagent/gpg/__init__.py
+++ b/libagent/gpg/__init__.py
@@ -19,7 +19,6 @@
 import time
 
 import daemon
-import pkg_resources
 import semver
 import Crypto.Hash
 import Crypto.PublicKey
@@ -27,6 +26,7 @@
 from Crypto.Signature import pkcs1_15
 from Crypto.Hash import SHA256, SHA512
 from Crypto.PublicKey import RSA
+from importlib import metadata
 
 from .. import device, formats, server, util
 from . import agent, client, encode, keyring, protocol
@@ -328,9 +328,8 @@ def main(device_type):
     parser = argparse.ArgumentParser(epilog=epilog)
 
     agent_package = device_type.package_name()
-    resources_map = {r.key: r for r in pkg_resources.require(agent_package)}
-    resources = [resources_map[agent_package], resources_map['lib-agent']]
-    versions = '\n'.join('{}={}'.format(r.key, r.version) for r in resources)
+    resources = [metadata.distribution(agent_package), metadata.distribution('lib-agent')]
+    versions = '\n'.join('{}={}'.format(r.metadata['Name'], r.version) for r in resources)
     parser.add_argument('--version', help='print the version info',
                         action='version', version=versions)
 
@@ -389,4 +388,4 @@ def main(device_type):
     else:
         device_type.ui = device.ui.UI(device_type=device_type, config=vars(args))
 
-    return args.func(device_type=device_type, args=args)
\ No newline at end of file
+    return args.func(device_type=device_type, args=args)
diff --git a/libagent/ssh/__init__.py b/libagent/ssh/__init__.py
index 64597748..68566893 100644
--- a/libagent/ssh/__init__.py
+++ b/libagent/ssh/__init__.py
@@ -13,8 +13,8 @@
 
 import configargparse
 import daemon
-import pkg_resources
 
+from importlib import metadata
 from .. import device, formats, server, util
 from . import client, protocol
 
@@ -72,9 +72,8 @@ def create_agent_parser(device_type):
     p.add_argument('-v', '--verbose', default=0, action='count')
 
     agent_package = device_type.package_name()
-    resources_map = {r.key: r for r in pkg_resources.require(agent_package)}
-    resources = [resources_map[agent_package], resources_map['lib-agent']]
-    versions = '\n'.join('{}={}'.format(r.key, r.version) for r in resources)
+    resources = [metadata.distribution(agent_package), metadata.distribution('lib-agent')]
+    versions = '\n'.join('{}={}'.format(r.metadata['Name'], r.version) for r in resources)
     p.add_argument('--version', help='print the version info',
                    action='version', version=versions)
 
diff --git a/setup.py b/setup.py
index 32483ae9..177402dc 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='lib-agent',
-    version='1.0.6',
+    version='1.0.7',
     description='Using OnlyKey as hardware SSH and GPG agent',
     author='CryptoTrust',
     author_email='admin@crp.to',