diff --git a/Makefile.am b/Makefile.am
index 170ca656d7..de32843d8d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@ include $(GLIB_MAKEFILE)
 
 SUBDIRS = \
 	. \
-	shared \
 	introspection \
 	libnm-core \
 	libnm \
@@ -39,7 +38,27 @@ EXTRA_DIST = \
 	linker-script-settings.ver \
 	Makefile.glib \
 	autogen.sh \
-	valgrind.suppressions
+	valgrind.suppressions \
+	\
+	shared/nm-common-macros.h \
+	shared/nm-dbus-compat.h \
+	shared/nm-default.h \
+	shared/nm-dispatcher-api.h \
+	shared/nm-test-libnm-utils.h \
+	shared/nm-test-utils-impl.c \
+	shared/nm-utils/gsystem-local-alloc.h \
+	shared/nm-utils/nm-glib.h \
+	shared/nm-utils/nm-macros-internal.h \
+	shared/nm-utils/nm-shared-utils.c \
+	shared/nm-utils/nm-shared-utils.h \
+	shared/nm-utils/nm-test-utils.h \
+	shared/nm-utils/nm-vpn-editor-plugin-call.h \
+	shared/nm-utils/nm-vpn-plugin-macros.h \
+	shared/nm-utils/nm-vpn-plugin-utils.c \
+	shared/nm-utils/nm-vpn-plugin-utils.h \
+	shared/nm-version-macros.h.in \
+	\
+	$(NULL)
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-tests=yes \
@@ -67,7 +86,14 @@ DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = NetworkManager.pc
 
-CLEANFILES = cscope.in.out cscope.out cscope.po.out
+CLEANFILES = \
+	cscope.in.out \
+	cscope.out \
+	cscope.po.out \
+	\
+	shared/nm-version-macros.h \
+	\
+	$(NULL)
 
 cscope:
 	cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -slibnm-glib -slibnm-util -sclients;
diff --git a/configure.ac b/configure.ac
index a19fdf50e2..ff0514987e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1136,7 +1136,6 @@ AM_CONDITIONAL(SETTING_DOCS_AVAILABLE, test "$build_setting_docs" = "yes" -o "$h
 
 AC_CONFIG_FILES([
 Makefile
-shared/Makefile
 shared/nm-version-macros.h
 src/Makefile
 src/tests/Makefile
diff --git a/shared/Makefile.am b/shared/Makefile.am
deleted file mode 100644
index adf101bf20..0000000000
--- a/shared/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-EXTRA_DIST = \
-     nm-utils/gsystem-local-alloc.h \
-     nm-utils/nm-glib.h \
-     nm-utils/nm-macros-internal.h \
-     nm-utils/nm-shared-utils.c \
-     nm-utils/nm-shared-utils.h \
-     nm-utils/nm-test-utils.h \
-     nm-utils/nm-vpn-editor-plugin-call.h \
-     nm-utils/nm-vpn-plugin-macros.h \
-     nm-utils/nm-vpn-plugin-utils.c \
-     nm-utils/nm-vpn-plugin-utils.h \
-     nm-common-macros.h \
-     nm-dbus-compat.h \
-     nm-default.h \
-     nm-dispatcher-api.h \
-     nm-test-libnm-utils.h \
-     nm-test-utils-impl.c \
-     nm-version-macros.h.in \
-     $(NULL)
-
-CLEANFILES=nm-version.h