diff --git a/Makefile.am b/Makefile.am
index 1f02564778..c5d85821e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,10 @@ bin_SCRIPTS = gstreamer-config
 m4datadir = $(datadir)/aclocal
 m4data_DATA = gstreamer.m4
 
-EXTRA_DIST = gstreamer.spec.in gstreamer-config.in
+EXTRA_DIST = gstreamer.spec.in gstreamer-config.in gstreamer.m4
+
+dist-hook:
+	cp gstreamer.spec $(distdir)
 
 rpm: dist
 	rpm -ta $(distdir).tar.gz
diff --git a/configure.in b/configure.in
index cbd02832fc..06716f41cb 100644
--- a/configure.in
+++ b/configure.in
@@ -77,7 +77,7 @@ AC_CHECK_HEADER(xaudio/decoder.h,[
 ])
 AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes")
 
-PLUGINS_DIR=${libdir}/plugins
+PLUGINS_DIR=${prefix}/lib/gst
 AC_DEFINE_UNQUOTED(PLUGINS_DIR,"$PLUGINS_DIR")
 AC_SUBST(PLUGINS_DIR)
 
@@ -163,4 +163,7 @@ test/cothreads/Makefile
 editor/Makefile
 tools/Makefile
 docs/Makefile
-stamp.h])
+stamp.h
+gstreamer-config
+gstreamer.spec])
+AC_OUTPUT_COMMANDS([chmod +x gstreamer-config])
diff --git a/editor/Makefile.am b/editor/Makefile.am
index d9bbadeefc..767be10ece 100644
--- a/editor/Makefile.am
+++ b/editor/Makefile.am
@@ -22,6 +22,7 @@ libgsteditorinclude_HEADERS =	\
 
 
 bin_PROGRAMS = gsteditor
+gsteditor_SOURCES = editor.c
 gsteditor_LDFLAGS = libgsteditor.la
 
 
diff --git a/gst/elements/Makefile.am b/gst/elements/Makefile.am
index 346ae7f5ac..7aa7bf3fa7 100644
--- a/gst/elements/Makefile.am
+++ b/gst/elements/Makefile.am
@@ -1,4 +1,6 @@
-lib_LTLIBRARIES = libgstelements.la
+filterdir = $(libdir)/gst
+
+filter_LTLIBRARIES = libgstelements.la
 
 libgstelements_la_DEPENDENCIES = ../libgst.la
 libgstelements_la_SOURCES =	\
diff --git a/gst/types/Makefile.am b/gst/types/Makefile.am
index 7c9a9d3a00..3792906aa4 100644
--- a/gst/types/Makefile.am
+++ b/gst/types/Makefile.am
@@ -1,4 +1,6 @@
-lib_LTLIBRARIES = libgsttypes.la
+filterdir = $(libdir)/gst
+
+filter_LTLIBRARIES = libgsttypes.la
 
 libgsttypes_la_DEPENDENCIES = ../libgst.la
 libgsttypes_la_SOURCES =	\
diff --git a/gst/xml/Makefile.am b/gst/xml/Makefile.am
index bff38573a1..3041022261 100644
--- a/gst/xml/Makefile.am
+++ b/gst/xml/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = save
+noinst_PROGRAMS = save
 
 INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) -I$(top_srcdir)
 LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(XML_LIBS) $(top_srcdir)/gst/libgst.la
diff --git a/gstreamer.spec.in b/gstreamer.spec.in
index 41599f3736..0011979359 100644
--- a/gstreamer.spec.in
+++ b/gstreamer.spec.in
@@ -56,5 +56,4 @@ make prefix=$RPM_BUILD_ROOT%{prefix} install
 
 %{prefix}/bin/*
 %{prefix}/lib/*
-%{prefix}/lib/gst/*
-%{prefix}/include/gst/*
+%{prefix}/include/*
diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index 346ae7f5ac..7aa7bf3fa7 100644
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -1,4 +1,6 @@
-lib_LTLIBRARIES = libgstelements.la
+filterdir = $(libdir)/gst
+
+filter_LTLIBRARIES = libgstelements.la
 
 libgstelements_la_DEPENDENCIES = ../libgst.la
 libgstelements_la_SOURCES =	\
diff --git a/test/bindings/Makefile.am b/test/bindings/Makefile.am
index 1f74861139..a9e385dd94 100644
--- a/test/bindings/Makefile.am
+++ b/test/bindings/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libcrashtest.la
+noinst_LTLIBRARIES = libcrashtest.la
 
 libcrashtest_la_SOURCES = \
 	dummy.c
@@ -6,6 +6,5 @@ libcrashtest_la_SOURCES = \
 include_HEADERS = \
 	dummy.h
 
-bin_PROGRAMS = test
-
+noinst_PROGRAMS = test
 test_LDADD = libcrashtest.la
diff --git a/test/cothreads/Makefile.am b/test/cothreads/Makefile.am
index 6ba1bb88a2..aa2034cf1c 100644
--- a/test/cothreads/Makefile.am
+++ b/test/cothreads/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = test simple
+noinst_PROGRAMS = test simple
 
 test_SOURCES = test.c cothreads.c object.c looper.c
 
diff --git a/test/xml/Makefile.am b/test/xml/Makefile.am
index dcac2c1a8e..d94ec5f464 100644
--- a/test/xml/Makefile.am
+++ b/test/xml/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = readreg createreg
+noinst_PROGRAMS = readreg createreg
 
 INCLUDES = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(XML_CFLAGS) -I$(top_srcdir)
 LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(XML_LIBS) $(top_srcdir)/gst/libgst.la