diff --git a/gst/Makefile.am b/gst/Makefile.am
index 08a2a921fe..8a485d9e64 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -1,4 +1,3 @@
-
 lib_LTLIBRARIES = libgstreamer.la
 noinst_LTLIBRARIES = libcothreads.la
 
@@ -123,7 +122,7 @@ dist-hook:
 distclean-local:
 	rm -f $(top_builddir)/gst/gstmarshal.c $(top_builddir)/gst/gstmarshal.h
 
-libgstreamerincludedir = $(includedir)/gst
+libgstreamerincludedir = $(includedir)/gstreamer-@VERSION@/gst
 libgstreamerinclude_HEADERS =		\
 	gst.h			\
 	gstconfig.h		\
diff --git a/gst/schedulers/cothreads_compat.h b/gst/schedulers/cothreads_compat.h
index 0ec30b1a54..0322749419 100644
--- a/gst/schedulers/cothreads_compat.h
+++ b/gst/schedulers/cothreads_compat.h
@@ -90,7 +90,7 @@ typedef cothread cothread_context;
  */
 #define do_cothreads_init(x) G_STMT_START{	\
     if (!cothreads_initialized())	\
-      cothreads_init(0x0200000, 32);	\
+      cothreads_init(0x0200000, 16);	\
   }G_STMT_END
 
 #define do_cothreads_stackquery(stack,size)	\
diff --git a/gstreamer.pc.in b/gstreamer.pc.in
index 5f013622b0..91c6771136 100644
--- a/gstreamer.pc.in
+++ b/gstreamer.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/gstreamer-@VERSION@
 toolsdir=${exec_prefix}/bin
 
 Name: GStreamer
diff --git a/gstreamer.spec.in b/gstreamer.spec.in
index d9b7168eaa..c65011f1e4 100644
--- a/gstreamer.spec.in
+++ b/gstreamer.spec.in
@@ -145,7 +145,7 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/gst
+%{_includedir}/%{name}-%{version}/gst
 %{_libdir}/libgstreamer.a
 %{_libdir}/libgstreamer.so
 %{_libdir}/pkgconfig/gstreamer*.pc
@@ -206,6 +206,9 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
 
 
 %changelog
+* Sat Jun 22 2002 Thomas Vander Stichele <thomas@apestaart.org>
+- moved header location
+
 * Mon Jun 17 2002 Thomas Vander Stichele <thomas@apestaart.org>
 - added popt
 - removed .la
diff --git a/libs/gst/bytestream/Makefile.am b/libs/gst/bytestream/Makefile.am
index 5f70e7d58f..ee255bd63f 100644
--- a/libs/gst/bytestream/Makefile.am
+++ b/libs/gst/bytestream/Makefile.am
@@ -3,7 +3,7 @@ librarydir = $(libdir)/gst
 library_LTLIBRARIES = libgstbytestream.la
 noinst_LTLIBRARIES = libgstbstest.la
 
-libgstbytestreamincludedir = $(includedir)/gst/bytestream
+libgstbytestreamincludedir = $(includedir)/gstreamer-@VERSION@/gst/bytestream
 libgstbytestreaminclude_HEADERS = bytestream.h
 
 libgstbytestream_la_SOURCES = bytestream.c 
diff --git a/libs/gst/control/Makefile.am b/libs/gst/control/Makefile.am
index 6a7533f23b..a5da982b40 100644
--- a/libs/gst/control/Makefile.am
+++ b/libs/gst/control/Makefile.am
@@ -2,7 +2,7 @@ librarydir = $(libdir)/gst
 
 library_LTLIBRARIES = libgstcontrol.la
 
-libgstcontrolincludedir = $(includedir)/gst/control
+libgstcontrolincludedir = $(includedir)/gstreamer-@VERSION@/gst/control
 libgstcontrolinclude_HEADERS = \
     control.h \
     dparammanager.h \
diff --git a/libs/gst/getbits/Makefile.am b/libs/gst/getbits/Makefile.am
index 38a66ff19c..62d39efa3f 100644
--- a/libs/gst/getbits/Makefile.am
+++ b/libs/gst/getbits/Makefile.am
@@ -8,7 +8,7 @@ else
 GSTARCH_SRCS = 
 endif
 
-libgstgetbitsincludedir = $(includedir)/gst/getbits
+libgstgetbitsincludedir = $(includedir)/gstreamer-@VERSION@/gst/getbits
 libgstgetbitsinclude_HEADERS = getbits.h
 
 libgstgetbits_la_SOURCES = getbits.c gstgetbits_inl.h gstgetbits_generic.c $(GSTARCH_SRCS)
diff --git a/libs/gst/putbits/Makefile.am b/libs/gst/putbits/Makefile.am
index 31e2d8085f..9dcbf7d3a6 100644
--- a/libs/gst/putbits/Makefile.am
+++ b/libs/gst/putbits/Makefile.am
@@ -2,7 +2,7 @@ librarydir = $(libdir)/gst
 
 library_LTLIBRARIES = libgstputbits.la
 
-libgstputbitsincludedir = $(includedir)/gst/putbits
+libgstputbitsincludedir = $(includedir)/gstreamer-@VERSION@/gst/putbits
 libgstputbitsinclude_HEADERS = putbits.h
 
 libgstputbits_la_SOURCES = putbits.c