diff --git a/Makefile.am b/Makefile.am
index 9cb49b9efe..c706e15b29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -952,7 +952,7 @@ src_cppflags = \
 	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/devices \
 	-I$(top_srcdir)/src/dhcp \
-	-I$(top_srcdir)/src/dns-manager \
+	-I$(top_srcdir)/src/dns \
 	-I$(top_srcdir)/src/dnsmasq-manager \
 	-I$(top_srcdir)/src/platform \
 	-I$(top_srcdir)/src/platform/wifi \
@@ -1299,16 +1299,16 @@ src_libNetworkManager_la_SOURCES = \
 	src/dhcp/nm-dhcp-dhclient-utils.c \
 	src/dhcp/nm-dhcp-dhclient-utils.h \
 	\
-	src/dns-manager/nm-dns-dnsmasq.c \
-	src/dns-manager/nm-dns-dnsmasq.h \
-	src/dns-manager/nm-dns-systemd-resolved.c \
-	src/dns-manager/nm-dns-systemd-resolved.h \
-	src/dns-manager/nm-dns-unbound.c \
-	src/dns-manager/nm-dns-unbound.h \
-	src/dns-manager/nm-dns-manager.c \
-	src/dns-manager/nm-dns-manager.h \
-	src/dns-manager/nm-dns-plugin.c \
-	src/dns-manager/nm-dns-plugin.h \
+	src/dns/nm-dns-dnsmasq.c \
+	src/dns/nm-dns-dnsmasq.h \
+	src/dns/nm-dns-systemd-resolved.c \
+	src/dns/nm-dns-systemd-resolved.h \
+	src/dns/nm-dns-unbound.c \
+	src/dns/nm-dns-unbound.h \
+	src/dns/nm-dns-manager.c \
+	src/dns/nm-dns-manager.h \
+	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 \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 40f620e85f..411868b8c8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -150,7 +150,7 @@ src/main-utils.c
 src/dhcp/nm-dhcp-dhclient.c
 src/dhcp/nm-dhcp-dhclient-utils.c
 src/dhcp/nm-dhcp-manager.c
-src/dns-manager/nm-dns-manager.c
+src/dns/nm-dns-manager.c
 src/devices/adsl/nm-device-adsl.c
 src/devices/bluetooth/nm-bluez-device.c
 src/devices/bluetooth/nm-device-bt.c
diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c
similarity index 100%
rename from src/dns-manager/nm-dns-dnsmasq.c
rename to src/dns/nm-dns-dnsmasq.c
diff --git a/src/dns-manager/nm-dns-dnsmasq.h b/src/dns/nm-dns-dnsmasq.h
similarity index 100%
rename from src/dns-manager/nm-dns-dnsmasq.h
rename to src/dns/nm-dns-dnsmasq.h
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns/nm-dns-manager.c
similarity index 100%
rename from src/dns-manager/nm-dns-manager.c
rename to src/dns/nm-dns-manager.c
diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns/nm-dns-manager.h
similarity index 100%
rename from src/dns-manager/nm-dns-manager.h
rename to src/dns/nm-dns-manager.h
diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns/nm-dns-plugin.c
similarity index 100%
rename from src/dns-manager/nm-dns-plugin.c
rename to src/dns/nm-dns-plugin.c
diff --git a/src/dns-manager/nm-dns-plugin.h b/src/dns/nm-dns-plugin.h
similarity index 100%
rename from src/dns-manager/nm-dns-plugin.h
rename to src/dns/nm-dns-plugin.h
diff --git a/src/dns-manager/nm-dns-systemd-resolved.c b/src/dns/nm-dns-systemd-resolved.c
similarity index 100%
rename from src/dns-manager/nm-dns-systemd-resolved.c
rename to src/dns/nm-dns-systemd-resolved.c
diff --git a/src/dns-manager/nm-dns-systemd-resolved.h b/src/dns/nm-dns-systemd-resolved.h
similarity index 100%
rename from src/dns-manager/nm-dns-systemd-resolved.h
rename to src/dns/nm-dns-systemd-resolved.h
diff --git a/src/dns-manager/nm-dns-unbound.c b/src/dns/nm-dns-unbound.c
similarity index 100%
rename from src/dns-manager/nm-dns-unbound.c
rename to src/dns/nm-dns-unbound.c
diff --git a/src/dns-manager/nm-dns-unbound.h b/src/dns/nm-dns-unbound.h
similarity index 100%
rename from src/dns-manager/nm-dns-unbound.h
rename to src/dns/nm-dns-unbound.h