diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 391de827..9cdccb5a 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -1,107 +1,108 @@
 # Makefile.am for the Python bindings.
 # Copyright (C) 2016 g10 Code GmbH
 #
 # This file is part of GPGME.
 #
 # GPGME is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of the
 # License, or (at your option) any later version.
 #
 # GPGME is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
 # Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 EXTRA_DIST = \
 	README \
 	MANIFEST.in \
 	gpgme.i \
 	helpers.c helpers.h private.h \
 	examples \
 	docs \
 	src
 
 dist-hook:
         cp -pr "$(srcdir)/docs" "$(DESTDIR)/docs"
 	rm -rf `find "$(srcdir)/docs" -name meta`
 
 SUBDIRS = . tests
 
 .PHONY: prepare
 prepare: copystamp
 
 # For VPATH builds we need to copy some files because Python's
 # distutils are not VPATH-aware.
 copystamp:
 	ln -sf "$(top_srcdir)/src/data.h" .
 	ln -sf "$(top_builddir)/config.h" .
 	ln -sf "$(srcdir)/src" gpg
 	touch $@
 
 all-local: copystamp
 	set -e ; for PYTHON in $(PYTHONS); do \
 	  CPP="$(CPP)" \
 	  CFLAGS="$(CFLAGS)" \
 	  srcdir="$(srcdir)" \
 	  top_builddir="$(top_builddir)" \
 	    $$PYTHON setup.py build --verbose --build-base="$$(basename "$${PYTHON}")-gpg" ; \
 	done
 
 python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc: copystamp
 	$(MKDIR_P) python$(PYTHON_VERSION)-gpg-dist
 	CPP="$(CPP)" \
 	CFLAGS="$(CFLAGS)" \
 	srcdir="$(srcdir)" \
 	top_builddir="$(top_builddir)" \
 	  $(PYTHON) setup.py sdist --verbose --dist-dir=python$(PYTHON_VERSION)-gpg-dist \
 		--manifest=python$(PYTHON_VERSION)-gpg-dist/MANIFEST
-	gpg2 --detach-sign --armor python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz
+	gpgbin=gpgconf --list-components | grep OpenPGP | sed -e 's/gpg:OpenPGP://g'
+	$(gpgbin) --detach-sign --armor python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz
 
 .PHONY: sdist
 sdist:	python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc
 
 .PHONY: upload
 upload: python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz \
         python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz.asc
 	twine upload $^
 
 CLEANFILES = copystamp \
 	config.h \
 	data.h \
 	gpg
 
 # Remove the rest.
 #
 # 'make distclean' clears the write bit, breaking rm -rf.  Fix the
 # permissions.
 clean-local:
 	rm -rf -- build
 	for PYTHON in $(PYTHONS); do \
 	  find "$$(basename "$${PYTHON}")-gpg" -type d ! -perm -200 -exec chmod u+w {} ';' ; \
 	  rm -rf -- "$$(basename "$${PYTHON}")-gpg" ; \
 	done
 
 install-exec-local:
 	set -e ; for PYTHON in $(PYTHONS); do \
 	  CPP="$(CPP)" \
 	  CFLAGS="$(CFLAGS)" \
 	  srcdir="$(srcdir)" \
 	  top_builddir="$(top_builddir)" \
 	  $$PYTHON setup.py \
 	  build \
 	  --build-base="$$(basename "$${PYTHON}")-gpg" \
 	  install \
 	  --prefix "$(DESTDIR)$(prefix)" \
 	  --verbose ; \
 	done
 
 uninstall-local:
 	set -x; GV=$$(echo $(VERSION) | tr - _); for PYTHON in $(PYTHONS); do \
 	  PLATLIB="$(prefix)/$$("$${PYTHON}" -c 'import sysconfig, os; print(os.path.relpath(sysconfig.get_path("platlib", scheme="posix_prefix"), sysconfig.get_config_var("prefix")))')" ; \
 	  rm -rf -- "$(DESTDIR)$${PLATLIB}/gpg" \
 		"$(DESTDIR)$${PLATLIB}"/gpg-$$GV-py*.egg-info ; \
 	done