diff --git a/Makefile.am b/Makefile.am
index eb588f5f4a..18593b09ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,3 +37,19 @@ endif
 
 include $(top_srcdir)/common/coverage/lcov.mak
 
+
+# cruft: plugins that have been merged or moved or renamed
+
+CRUFT_FILES = \
+	$(top_builddir)/gst/aacparse/.libs/*.{so,dll,DLL,dylib} \
+	$(top_builddir)/gst/amrparse/.libs/*.{so,dll,DLL,dylib} \
+	$(top_builddir)/gst/flacparse/.libs/*.{so,dll,DLL,dylib}
+
+CRUFT_DIRS = \
+	$(top_srcdir)/gst/aacparse \
+	$(top_srcdir)/gst/amrparse \
+	$(top_srcdir)/gst/flacparse
+
+include $(top_srcdir)/common/cruft.mak
+
+all-local: check-cruft
diff --git a/common b/common
index 14cec891e9..358cf5c82f 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 14cec891e98eb39780f67e89a1b821a839c7e370
+Subproject commit 358cf5c82f09b315f77f6002c5d95e05f63b0f3b