diff --git a/elementgen/Makefile.am b/elementgen/Makefile.am
index 18d86c7d55..838247ce44 100644
--- a/elementgen/Makefile.am
+++ b/elementgen/Makefile.am
@@ -1,8 +1,6 @@
-TARGETS = element-gen.exe gsts-xmlinspect
+TARGETS = $(noinst_SCRIPTS)
 DEBUGS = $(addsuffix .mdb, $(TARGETS))
 
-all: $(TARGETS)
-
 element-gen.exe: $(srcdir)/elementgen.cs
 	$(CSC) -out:$@ -debug $(srcdir)/elementgen.cs
 
diff --git a/generator/Makefile.am b/generator/Makefile.am
index 7c4dc7268f..21b9bc287f 100644
--- a/generator/Makefile.am
+++ b/generator/Makefile.am
@@ -64,6 +64,7 @@ EXTRA_DIST =					\
 	$(dist_sources)
 
 CLEANFILES = gst-gapi_codegen.exe gst-gapi_codegen.exe.mdb
+MAINTAINERCLEANFILES = Makefile.in
 
 gst-gapi_codegen.exe: $(build_sources)
 	$(CSC) -debug -out:gst-gapi_codegen.exe $(WIN64DEFINES) $(OFF_T_FLAGS) $(references) $(build_sources)
diff --git a/gstreamer-sharp/baseplugins/Makefile.am b/gstreamer-sharp/baseplugins/Makefile.am
index c4cb6aa820..054c1fe2ca 100644
--- a/gstreamer-sharp/baseplugins/Makefile.am
+++ b/gstreamer-sharp/baseplugins/Makefile.am
@@ -8,6 +8,7 @@ XML_FILES = $(patsubst %,$(builddir)/%.xml,$(ELEMENTS))
 
 EXTRA_DIST = $(METADATA_FILES) $(INSPECT_FILES)
 CLEANFILES = $(XML_FILES) $(CS_FILES)
+MAINTAINERCLEANFILES = Makefile.in
 
 plugins-update: $(patsubst $(srcdir)/inspect/%.raw, inspect-%, $(INSPECT_FILES))
 inspect-%:
diff --git a/gstreamer-sharp/coreplugins/Makefile.am b/gstreamer-sharp/coreplugins/Makefile.am
index 3b26131116..d27d0a5767 100644
--- a/gstreamer-sharp/coreplugins/Makefile.am
+++ b/gstreamer-sharp/coreplugins/Makefile.am
@@ -14,6 +14,7 @@ XML_FILES = $(patsubst %,$(builddir)/%.xml,$(ELEMENTS))
 
 EXTRA_DIST = $(METADATA_FILES) $(CUSTOM_FILES) $(INSPECT_FILES) $(OTHER_CS_FILES)
 CLEANFILES = $(XML_FILES) $(CS_FILES)
+MAINTAINERCLEANFILES = Makefile.in
 
 plugins-update: $(patsubst $(srcdir)/inspect/%.raw, inspect-%, $(INSPECT_FILES))
 inspect-%:
diff --git a/gstreamer-sharp/glue/Makefile.am b/gstreamer-sharp/glue/Makefile.am
index 71212b1f78..254007e735 100644
--- a/gstreamer-sharp/glue/Makefile.am
+++ b/gstreamer-sharp/glue/Makefile.am
@@ -28,8 +28,9 @@ nodist_libgstreamersharpglue_0_10_la_SOURCES = generated.c
 libgstreamersharpglue_0_10_la_LIBADD = $(GST_LIBS)
 
 libgstreamersharpglue_0_10_la_LDFLAGS = -module -avoid-version -no-undefined
-libstreamersharpglue.dll: $(libstreamersharpglue_0_10_la_OBJECTS) libstreamersharpglue.rc libstreamersharpglue.def
-	./build-dll libstreamersharpglue-0.10 $(VERSION)
+
+libgstreamersharpglue.dll: $(libgstreamersharpglue_0_10_la_OBJECTS) libgstreamersharpglue.rc libgstreamersharpglue.def
+	./build-dll libgstreamersharpglue-0.10 $(VERSION)
 
 INCLUDES = -Wall $(GST_CFLAGS) -I$(top_srcdir)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c65335df85..518775eb1b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,7 +12,7 @@ run-test: $(ASSEMBLY)
 
 EXTRA_DIST = $(ASSEMBLY_CSFILES)
 CLEANFILES = $(ASSEMBLY) *.mdb *.pdb TestResult.xml
-DISTCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in
 
 clean-local:
 	rm -rf %temp%