diff --git a/Makefile.am b/Makefile.am
index 6eb3dc6..423d7b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -152,8 +152,7 @@ test_dbus_py_test_la_SOURCES = \
 
 # === dbus package ===
 
-dbuspydir = $(pyexecdir)
-nobase_dbuspy_DATA = \
+nobase_python_PYTHON = \
     dbus/bus.py \
     dbus/connection.py \
     dbus/_compat.py \
@@ -173,12 +172,12 @@ nobase_dbuspy_DATA = \
     dbus/types.py
 
 if !HAVE_PYTHON_3
-nobase_dbuspy_DATA += \
+nobase_python_PYTHON += \
     dbus/gobject_service.py \
     $(NULL)
 endif
 
-check_py_sources = $(nobase_dbuspy_DATA)
+check_py_sources = $(nobase_python_PYTHON)
 include $(top_srcdir)/tools/check-coding-style.mk
 
 # === Devel stuff ===
@@ -420,7 +419,7 @@ clean-local:
 
 APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/.libs
 
-api api/index.html: $(nobase_dbuspy_DATA) \
+api api/index.html: $(nobase_python_PYTHON) \
 		    _dbus_bindings.la \
 		    _dbus_glib_bindings.la
 	rm -rf api