diff --git a/setup.py b/setup.py
index 5e0da7a..6b63997 100644
--- a/setup.py
+++ b/setup.py
@@ -31,6 +31,5 @@ setup(
         'trezor-agent = trezor_agent.__main__:run_agent',
         'trezor-git = trezor_agent.__main__:run_git',
         'trezor-gpg = trezor_agent.gpg.signer:main',
-        'trezor-git-gpg-wrapper = trezor_agent.gpg.git_wrapper:main',
     ]},
 )
diff --git a/trezor_agent/gpg/trezor-git-gpg-wrapper.sh b/trezor_agent/gpg/trezor-git-gpg-wrapper.sh
new file mode 100755
index 0000000..04a8807
--- /dev/null
+++ b/trezor_agent/gpg/trezor-git-gpg-wrapper.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+if [[ "$*" == *"--verify"* ]]
+then
+	gpg2 $*  # verify using GPG2 (for ECDSA and EdDSA keys)
+else
+	python -m trezor_agent.gpg.git_wrapper $*  # sign using TREZOR
+fi