diff --git a/docs/development.rst b/docs/development.rst
index 9e29fe24d..aef6d0172 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -338,7 +338,9 @@ Checklist:
     scripts/sdist-sign X.Y.Z
     scripts/upload-pypi X.Y.Z test
     scripts/upload-pypi X.Y.Z
+- put binaries into dist/borg-OSNAME and sign them:
 
+    scripts/sign-binaries 201912312359
 - close release milestone on Github
 - announce on:
 
diff --git a/scripts/sign-binaries b/scripts/sign-binaries
index e7ae657e7..4f145be75 100755
--- a/scripts/sign-binaries
+++ b/scripts/sign-binaries
@@ -1,9 +1,20 @@
 #!/bin/bash
-# usage: sign-binaries 201512312359
+
+D=$1
+
+if [ "$D" = "" ]; then
+    echo "Usage: sign-binaries 201912312359"
+    exit
+fi
+
+if [ "$QUBES_GPG_DOMAIN" = "" ]; then
+    GPG=gpg
+else
+    GPG=qubes-gpg-client-wrapper
+fi
 
 for file in dist/borg-*; do
-    gpg --armor --detach-sign $file
+    $GPG --local-user "Thomas Waldmann" --armor --detach-sign --output $file.asc $file
 done
 
-touch -t $1 dist/*
-
+touch -t $D dist/*