diff --git a/ChangeLog b/ChangeLog
index 2abb83adf2..b268de4e49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-06-14  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* configure.ac:
+	* sys/Makefile.am:
+	* sys/directdraw/Makefile.am:
+	* sys/directsound/Makefile.am:
+	* sys/waveform/Makefile.am:
+	Make sure to dist everything needed for win32 builds.
+
 2007-06-14  Edward Hervey  <edward@fluendo.com>
 
 	* gst/qtdemux/qtdemux.c: (qtdemux_parse_trak):
diff --git a/configure.ac b/configure.ac
index f04c12bcba..bd59459c17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1058,6 +1058,7 @@ sys/sunaudio/Makefile
 sys/osxaudio/Makefile
 sys/osxvideo/Makefile
 sys/v4l2/Makefile
+sys/waveform/Makefile
 sys/ximage/Makefile
 po/Makefile.in
 tests/Makefile
diff --git a/sys/Makefile.am b/sys/Makefile.am
index b4d52f124b..8e1528e406 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -78,4 +78,4 @@ endif
 
 SUBDIRS=$(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR)
 
-DIST_SUBDIRS=directdraw directsound oss osxaudio osxvideo sunaudio v4l2 ximage
+DIST_SUBDIRS=directdraw directsound oss osxaudio osxvideo sunaudio v4l2 waveform ximage
diff --git a/sys/directdraw/Makefile.am b/sys/directdraw/Makefile.am
index 3fa5e85fd9..dddaf18992 100644
--- a/sys/directdraw/Makefile.am
+++ b/sys/directdraw/Makefile.am
@@ -7,3 +7,5 @@ libgstdirectdrawsink_la_LIBADD = $(DIRECTDRAW_LIBS) \
 	$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
 	-lgstinterfaces-$(GST_MAJORMINOR)
 libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTDRAW_LDFLAGS)
+
+noinst_HEADERS= gstdirectdrawsink.h
diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am
index 3b24de6268..010ec6cd5b 100644
--- a/sys/directsound/Makefile.am
+++ b/sys/directsound/Makefile.am
@@ -7,3 +7,5 @@ libgstdirectsoundsink_la_LIBADD = $(DIRECTSOUND_LIBS) \
 	$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
 	-lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR)
 libgstdirectsoundsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)
+
+noinst_HEADERS = gstdirectsoundsink.h
diff --git a/sys/waveform/Makefile.am b/sys/waveform/Makefile.am
new file mode 100644
index 0000000000..456e91f8eb
--- /dev/null
+++ b/sys/waveform/Makefile.am
@@ -0,0 +1,16 @@
+plugin_LTLIBRARIES = libgstwaveformsink.la
+
+# FIXME: Replace DIRECTSOUND CFLAGS+LIBS with waveform related ones and fix
+# the configure.ac + sys/Makefile.am to get this stuff building in MingW
+# For now, it's just disted for use in the VS builds.
+
+libgstwaveformsink_la_SOURCES =  gstwaveformsink.c gstwaveformplugin.c
+libgstwaveformsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
+        $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTSOUND_CFLAGS)
+libgstwaveformsink_la_LIBADD = $(DIRECTSOUND_LIBS) \
+        $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
+        -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR)
+libgstwaveformsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)
+
+noinst_HEADERS = gstwaveformsink.h
+