diff --git a/Makefile.am b/Makefile.am
index c706e15b29..6f202bd3fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -960,7 +960,7 @@ src_cppflags = \
 	-I$(top_srcdir)/src/ndisc \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/src/supplicant \
-	-I$(top_srcdir)/src/vpn-manager \
+	-I$(top_srcdir)/src/vpn \
 	\
 	-DPREFIX=\"$(prefix)\" \
 	-DG_LOG_DOMAIN=\""NetworkManager"\" \
@@ -1353,10 +1353,10 @@ src_libNetworkManager_la_SOURCES = \
 	src/supplicant/nm-supplicant-settings-verify.h \
 	src/supplicant/nm-supplicant-types.h \
 	\
-	src/vpn-manager/nm-vpn-connection.c \
-	src/vpn-manager/nm-vpn-connection.h \
-	src/vpn-manager/nm-vpn-manager.c \
-	src/vpn-manager/nm-vpn-manager.h \
+	src/vpn/nm-vpn-connection.c \
+	src/vpn/nm-vpn-connection.h \
+	src/vpn/nm-vpn-manager.c \
+	src/vpn/nm-vpn-manager.h \
 	\
 	src/nm-act-request.c \
 	src/nm-act-request.h \
diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c
similarity index 100%
rename from src/vpn-manager/nm-vpn-connection.c
rename to src/vpn/nm-vpn-connection.c
diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn/nm-vpn-connection.h
similarity index 100%
rename from src/vpn-manager/nm-vpn-connection.h
rename to src/vpn/nm-vpn-connection.h
diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn/nm-vpn-manager.c
similarity index 100%
rename from src/vpn-manager/nm-vpn-manager.c
rename to src/vpn/nm-vpn-manager.c
diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn/nm-vpn-manager.h
similarity index 100%
rename from src/vpn-manager/nm-vpn-manager.h
rename to src/vpn/nm-vpn-manager.h