diff --git a/common b/common
index 00d89f598b..e5997d9e2b 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 00d89f598b34ec2b5319856fe7b3f5625df28d48
+Subproject commit e5997d9e2b4e162ad423f9b9ec3ac9b29e12bb05
diff --git a/docs/devhelp/Makefile.am b/docs/devhelp/Makefile.am
index 357c9d487e..c24e2de812 100644
--- a/docs/devhelp/Makefile.am
+++ b/docs/devhelp/Makefile.am
@@ -1,17 +1,19 @@
-EXTRA_DIST=gstreamer.devhelp gstreamer-libs.devhelp
+EXTRA_DIST=html2xml.py
+
+all-am: devhelp
 
 devhelp: gstreamer.devhelp gstreamer-libs.devhelp
 
 gstreamer.devhelp:
 	cd ../gst && make
 	./html2xml.py ../gst/html
-	sed 's/base=""/base="\/usr\/share\/doc\/gstreamer-devel-@VERSION@\/html\/gstreamer"/g' html.devhelp > gstreamer.devhelp
+	sed 's@base=""@base="@HTML_DIR@/gstreamer"@g' html.devhelp > gstreamer.devhelp
 	perl -i -p -e 's/name="html"/name="gstreamer"/' gstreamer.devhelp
 	rm html.devhelp
 
 gstreamer-libs.devhelp:
 	cd ../libs && make
 	./html2xml.py ../libs/html
-	sed 's/base=""/base="\/usr\/share\/doc\/gstreamer-devel-@VERSION@\/html\/gstreamer-libs"/g' html.devhelp > gstreamer-libs.devhelp
+	sed 's@base=""@base="@HTML_DIR@/gstreamer-libs"@g' html.devhelp > gstreamer-libs.devhelp
 	perl -i -p -e 's/name="html"/name="gstreamer-libs"/' gstreamer-libs.devhelp
 	rm html.devhelp
diff --git a/gstreamer.spec.in b/gstreamer.spec.in
index 07e6810bf2..e4fb90c84a 100644
--- a/gstreamer.spec.in
+++ b/gstreamer.spec.in
@@ -76,17 +76,20 @@ applications and plugins for GStreamer.
 
 %files devel
 %defattr(-, root, root)
-%doc html
 %{_includedir}/gst
 %{_libdir}/libgstreamer.a
 %{_libdir}/libgstreamer.la
 %{_libdir}/libgstreamer.so
 %{_libdir}/pkgconfig/*
+%{_datadir}/gtk-doc/html/*
 %{_datadir}/devhelp/specs/gstreamer.devhelp
 %{_datadir}/devhelp/specs/gstreamer-libs.devhelp
 
 
 %changelog
+* Mon Apr 29 2002 Thomas Vander Stichele <thomas@apestaart.org>
+- moved html docs to gtk-doc standard directory
+
 * Tue Mar 5 2002 Thomas Vander Stichele <thomas@apestaart.org>
 - move version defines of glib2 and libxml2 to configure.ac
 - add BuildRequires for these two libs
@@ -176,7 +179,7 @@ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
   --enable-debug \
   --with-configdir=/etc/gstreamer \
   --disable-tests --disable-examples --disable-debug-color \
-  --enable-docs-build --with-html-dir=$RPM_BUILD_DIR/%{name}-%{version}/html
+  --enable-docs-build
 if [ "$SMP" != "" ]; then
   (make "MAKE=make -k -j $SMP"; exit 0)
 else
@@ -202,8 +205,8 @@ cp $RPM_BUILD_DIR/%{name}-%{version}/docs/devhelp/*.devhelp $RPM_BUILD_ROOT/usr/
 %post devel
 # adding devhelp links to work around different base not working
 mkdir -p %{_datadir}/devhelp/books
-ln -sf %{_datadir}/doc/%{name}-devel-%{version}/html/gstreamer %{_datadir}/devhelp/books
-ln -sf %{_datadir}/doc/%{name}-devel-%{version}/html/gstreamer-libs %{_datadir}/devhelp/books
+ln -sf %{_datadir}/gtk-doc/html/gstreamer %{_datadir}/devhelp/books
+ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
 
 %postun
 /sbin/ldconfig