diff --git a/gst/modplug/Makefile.am b/gst/modplug/Makefile.am
index 172691af64..c0d5e4b322 100644
--- a/gst/modplug/Makefile.am
+++ b/gst/modplug/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS=libmodplug .
+
 plugindir = $(libdir)/gst
 
 plugin_LTLIBRARIES = libgstmodplug.la
@@ -7,7 +9,5 @@ libgstmodplug_la_CXXFLAGS = $(GST_CFLAGS)
 libgstmodplug_la_LIBADD = $(GST_LIBS) libmodplug/libmodplug.la
 libgstmodplug_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@
 
-SUBDIRS=libmodplug
-
 noinst_HEADERS = gstmodplug.h
 
diff --git a/gst/modplug/libmodplug/Makefile.am b/gst/modplug/libmodplug/Makefile.am
index 83d04428d8..be6698b9ff 100644
--- a/gst/modplug/libmodplug/Makefile.am
+++ b/gst/modplug/libmodplug/Makefile.am
@@ -1,4 +1,5 @@
-lib_LTLIBRARIES = libmodplug.la
+noinst_LTLIBRARIES = libmodplug.la
+
 libmodplug_la_CXXFLAGS = -fno-exceptions -Wall -ffast-math -D_REENTRANT
 libmodplug_la_LDFLAGS = -module -avoid-version
 libmodplug_la_SOURCES = tables.cpp         \
@@ -34,7 +35,6 @@ libmodplug_la_SOURCES = tables.cpp         \
                         load_psm.cpp       \
                         modplug.cpp
 
-include_HEADERS = modplug.h
-noinst_HEADERS = it_defs.h stdafx.h sndfile.h
+noinst_HEADERS = it_defs.h stdafx.h sndfile.h modplug.h
 
 EXTRA_DIST = changes.txt