diff --git a/Makefile.am b/Makefile.am
index 35c355b951..c9fa8b8a83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1472,6 +1472,31 @@ EXTRA_DIST += \
 	src/nm-test-utils-core.h \
 	src/NetworkManager.ver
 
+###############################################################################
+# src/dhcp-manager
+###############################################################################
+
+libexec_PROGRAMS += src/dhcp-manager/nm-dhcp-helper
+
+src_dhcp_manager_nm_dhcp_helper_CPPFLAGS = \
+	$(GLIB_CFLAGS) \
+	-I$(top_srcdir)/shared \
+	-I${top_builddir}/shared \
+	-I$(top_srcdir)/libnm-core \
+	-I$(top_builddir)/libnm-core \
+	-DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \
+	-DNMRUNDIR=\"$(nmrundir)\"
+
+src_dhcp_manager_nm_dhcp_helper_SOURCES = \
+	src/dhcp-manager/nm-dhcp-helper.c \
+	src/dhcp-manager/nm-dhcp-helper-api.h \
+	$(NULL)
+
+src_dhcp_manager_nm_dhcp_helper_LDFLAGS = \
+	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
+
+src_dhcp_manager_nm_dhcp_helper_LDADD = $(GLIB_LIBS)
+
 ###############################################################################
 
 girdir = $(datadir)/gir-1.0
diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index e6fe60c1b7..3c6155b9c6 100644
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -1,20 +1 @@
-libexec_PROGRAMS = nm-dhcp-helper
-
-nm_dhcp_helper_SOURCES = \
-	nm-dhcp-helper.c \
-	nm-dhcp-helper-api.h \
-	$(NULL)
-
-nm_dhcp_helper_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	-I$(top_srcdir)/shared \
-	-I${top_builddir}/shared \
-	-I$(top_srcdir)/libnm-core \
-	-I$(top_builddir)/libnm-core \
-	-DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \
-	-DNMRUNDIR=\"$(nmrundir)\"
-
-nm_dhcp_helper_LDFLAGS = \
-	-Wl,--version-script="$(top_srcdir)/linker-script-binary.ver"
-
-nm_dhcp_helper_LDADD = $(GLIB_LIBS)
+SUBDIRS = tests