diff --git a/Makefile.am b/Makefile.am
index d8461de..9b3fcbd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,3 @@
-EXTRA_DIST = \
-	autogen.sh \
-	README.md \
-	COPYING
+EXTRA_DIST = autogen.sh
 
-SUBDIRS = src samples
+SUBDIRS = src
diff --git a/configure.ac b/configure.ac
index dc562d4..f54171c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,6 @@ AC_ARG_ENABLE([analyze],
 
 AM_CONDITIONAL(STATIC, test x"$static" = x"true")
 
-AC_CONFIG_FILES([Makefile src/Makefile samples/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile])
 AC_CONFIG_SUBDIRS([libsodium])
 AC_OUTPUT
diff --git a/libsodium/Makefile.am b/libsodium/Makefile.am
index ee794b0..5a73134 100644
--- a/libsodium/Makefile.am
+++ b/libsodium/Makefile.am
@@ -1,19 +1,8 @@
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = \
-	autogen.sh \
-	libsodium.sln \
-	libsodium.vcxproj \
-	libsodium.vcxproj.filters \
-	LICENSE \
-	README.markdown \
-	THANKS
+EXTRA_DIST = autogen.sh
 
-SUBDIRS = \
-	dist-build \
-	msvc-scripts \
-	src \
-	test
+SUBDIRS = src
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = @PACKAGE_NAME@.pc
diff --git a/libsodium/configure.ac b/libsodium/configure.ac
index 21b8f10..281e3ff 100644
--- a/libsodium/configure.ac
+++ b/libsodium/configure.ac
@@ -442,15 +442,10 @@ AH_VERBATIM([NDEBUG], [/* Always evaluate assert() calls */
 #endif])
 
 AC_CONFIG_FILES([Makefile
-                 dist-build/Makefile
                  libsodium.pc
-                 libsodium-uninstalled.pc
-                 msvc-scripts/Makefile
                  src/Makefile
                  src/libsodium/Makefile
                  src/libsodium/include/Makefile
                  src/libsodium/include/sodium/version.h
-                 test/default/Makefile
-                 test/Makefile
                  ])
 AC_OUTPUT