diff --git a/.gitignore b/.gitignore
index b2fb349262..ca09ef22e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -246,7 +246,7 @@ test-*.trs
 /src/dhcp/tests/test-dhcp-dhclient
 /src/dhcp/tests/test-dhcp-options
 /src/dhcp/tests/test-dhcp-utils
-/src/dnsmasq-manager/tests/test-dnsmasq-utils
+/src/dnsmasq/tests/test-dnsmasq-utils
 /src/nm-iface-helper
 /src/ndisc/tests/test-ndisc-fake
 /src/ndisc/tests/test-ndisc-linux
@@ -292,6 +292,7 @@ test-*.trs
 /src/dhcp-manager/tests/test-dhcp-dhclient
 /src/dhcp-manager/tests/test-dhcp-options
 /src/dhcp-manager/tests/test-dhcp-utils
+/src/dnsmasq-manager/tests/test-dnsmasq-utils
 /src/rdisc/
 /src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
 /src/settings/plugins/ifnet/tests/check_ifnet
diff --git a/Makefile.am b/Makefile.am
index 6f202bd3fd..cac41b2047 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -953,7 +953,7 @@ src_cppflags = \
 	-I$(top_srcdir)/src/devices \
 	-I$(top_srcdir)/src/dhcp \
 	-I$(top_srcdir)/src/dns \
-	-I$(top_srcdir)/src/dnsmasq-manager \
+	-I$(top_srcdir)/src/dnsmasq \
 	-I$(top_srcdir)/src/platform \
 	-I$(top_srcdir)/src/platform/wifi \
 	-I$(top_srcdir)/src/ppp-manager \
@@ -1310,10 +1310,10 @@ src_libNetworkManager_la_SOURCES = \
 	src/dns/nm-dns-plugin.c \
 	src/dns/nm-dns-plugin.h \
 	\
-	src/dnsmasq-manager/nm-dnsmasq-manager.c \
-	src/dnsmasq-manager/nm-dnsmasq-manager.h \
-	src/dnsmasq-manager/nm-dnsmasq-utils.c \
-	src/dnsmasq-manager/nm-dnsmasq-utils.h \
+	src/dnsmasq/nm-dnsmasq-manager.c \
+	src/dnsmasq/nm-dnsmasq-manager.h \
+	src/dnsmasq/nm-dnsmasq-utils.c \
+	src/dnsmasq/nm-dnsmasq-utils.h \
 	\
 	src/ppp-manager/nm-ppp-manager.c \
 	src/ppp-manager/nm-ppp-manager.h \
@@ -2553,16 +2553,16 @@ check_local += check-local-devices-team
 endif
 
 ###############################################################################
-# src/dnsmasq-manager/tests
+# src/dnsmasq/tests
 ###############################################################################
 
-check_programs += src/dnsmasq-manager/tests/test-dnsmasq-utils
+check_programs += src/dnsmasq/tests/test-dnsmasq-utils
 
-src_dnsmasq_manager_tests_test_dnsmasq_utils_CPPFLAGS = \
+src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \
 	$(src_tests_cppflags) \
 	-DTESTDIR="\"$(abs_srcdir)\""
 
-src_dnsmasq_manager_tests_test_dnsmasq_utils_LDADD = \
+src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \
 	src/libNetworkManagerTest.la
 
 ###############################################################################
diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq/nm-dnsmasq-manager.c
similarity index 100%
rename from src/dnsmasq-manager/nm-dnsmasq-manager.c
rename to src/dnsmasq/nm-dnsmasq-manager.c
diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.h b/src/dnsmasq/nm-dnsmasq-manager.h
similarity index 100%
rename from src/dnsmasq-manager/nm-dnsmasq-manager.h
rename to src/dnsmasq/nm-dnsmasq-manager.h
diff --git a/src/dnsmasq-manager/nm-dnsmasq-utils.c b/src/dnsmasq/nm-dnsmasq-utils.c
similarity index 100%
rename from src/dnsmasq-manager/nm-dnsmasq-utils.c
rename to src/dnsmasq/nm-dnsmasq-utils.c
diff --git a/src/dnsmasq-manager/nm-dnsmasq-utils.h b/src/dnsmasq/nm-dnsmasq-utils.h
similarity index 100%
rename from src/dnsmasq-manager/nm-dnsmasq-utils.h
rename to src/dnsmasq/nm-dnsmasq-utils.h
diff --git a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c b/src/dnsmasq/tests/test-dnsmasq-utils.c
similarity index 97%
rename from src/dnsmasq-manager/tests/test-dnsmasq-utils.c
rename to src/dnsmasq/tests/test-dnsmasq-utils.c
index 92f32de87f..a826abaf30 100644
--- a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c
+++ b/src/dnsmasq/tests/test-dnsmasq-utils.c
@@ -92,7 +92,7 @@ main (int argc, char **argv)
 {
 	nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT");
 
-	g_test_add_func ("/dnsmasq-manager/address-ranges", test_address_ranges);
+	g_test_add_func ("/dnsmasq/address-ranges", test_address_ranges);
 
 	return g_test_run ();
 }