diff --git a/ChangeLog b/ChangeLog
index f8fda9efc3..c9da1a1700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
+2004-05-02  Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
+
+	* docs/gst/Makefile.am :
+	* docs/libs/Makefile.am :
+		apply a patch from Arwed v. Merkatz so that gtk-doc
+		generated docs install (same for .devhelp file)
+		(fixes part 1 of #138836)
+
 2004-04-30  Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
+
 	* docs/faq/dependencies.xml: typo
 	* docs/faq/getting.xml :
 	    - fix download URL for new gstreamer site
diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am
index a10ea40fd0..b65d823ad9 100644
--- a/docs/gst/Makefile.am
+++ b/docs/gst/Makefile.am
@@ -264,7 +264,6 @@ distclean-local: clean
 	rm -rf *.o
 
 # thomas: make docs parallel installable; devhelp requires majorminor too
-if DOC_HTML
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) 
 	(installfiles=`echo ./html/*.html`; \
@@ -312,11 +311,6 @@ uninstall-local:
 	  rm -f $(DESTDIR)$(TARGET_DIR)/index.sgml; \
 	fi) 
 	if test -d $(DESTDIR)$(TARGET_DIR); then rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR); fi
-else
-install-data-local:
-uninstall-local:
-all-local:
-endif
 
 #
 # Require gtk-doc when making dist
@@ -337,6 +331,7 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	-cp $(srcdir)/sgml/*.xml $(distdir)/xml
 	-cp $(srcdir)/html/index.sgml $(distdir)/html
 	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
+	-cp $(srcdir)/html/gstreamer.devhelp $(distdir)/html
 
 	images=$(HTML_IMAGES) ;    	      \
 	for i in "" $$images ; do		      \
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index b373ef7144..38f2719315 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -218,7 +218,6 @@ distclean-local: clean
 	rm -f *.o
 
 
-if DOC_HTML
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) 
 	(installfiles=`echo ./html/*.html`; \
@@ -266,10 +265,6 @@ uninstall-local:
 	  rm -f $(DESTDIR)$(TARGET_DIR)/index.sgml; \
 	fi) 
 	if test -d $(DESTDIR)$(TARGET_DIR); then rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(TARGET_DIR); fi
-else
-install-data-local:
-uninstall-local:
-endif
 
 #
 # Require gtk-doc when making dist
@@ -290,6 +285,7 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	-cp $(srcdir)/sgml/*.xml $(distdir)/xml
 	-cp $(srcdir)/html/index.sgml $(distdir)/html
 	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
+	-cp $(srcdir)/html/gstreamer-libs.devhelp $(distdir)/html
 
 	images=$(HTML_IMAGES) ;    	      \
 	for i in "" $$images ; do		      \