diff --git a/ChangeLog b/ChangeLog
index 803048ad52..3b64c43f2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-02  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* docs/faq/Makefile.am:
+	* docs/manual/Makefile.am:
+	* docs/manuals.mak:
+	* docs/pwg/Makefile.am:
+	* gst/Makefile.am:
+	  possible fixes for automake-1.5
+
 2005-05-01  Benjamin Otte  <in7y118@public.uni-hamburg.de>
 
 	* gst/elements/gstfakesink.c: (gst_fakesink_change_state):
diff --git a/docs/faq/Makefile.am b/docs/faq/Makefile.am
index 31427736bd..57f095032c 100644
--- a/docs/faq/Makefile.am
+++ b/docs/faq/Makefile.am
@@ -17,7 +17,7 @@ PNG_SRC =
 FIG_SRC = $(notdir $(wildcard $(srcdir)/*.fig))
 
 # extra sources to copy in build directory
-EXTRA_SOURCES = gst-uninstalled
+EXTRA_SRC = gst-uninstalled
 
 ### this is the generic bit and you shouln't need to change this
 
diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index 4a577eb03a..8ee9e30038 100644
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -17,7 +17,7 @@ PNG_SRC =
 FIG_SRC = $(notdir $(wildcard $(srcdir)/*.fig))
 
 # extra sources to copy in build directory
-EXTRA_SOURCES = 
+EXTRA_SRC = 
 
 ### this is the generic bit and you shouln't need to change this
 
diff --git a/docs/manuals.mak b/docs/manuals.mak
index 14079302ee..87a26fa0f0 100644
--- a/docs/manuals.mak
+++ b/docs/manuals.mak
@@ -22,7 +22,7 @@ PNG_BUILT = $(foreach file, $(PNG), $(BUILDIMAGESDIR)/$(file))
 EPS_BUILT = $(foreach file, $(EPS), $(BUILDIMAGESDIR)/$(file))
 PDF_BUILT = $(foreach file, $(PDF), $(BUILDIMAGESDIR)/$(file))
 
-SRC = $(XML) $(PNG_SRC) $(FIG_SRC) $(CSS) $(EXTRA_SOURCES)
+SRC = $(XML) $(PNG_SRC) $(FIG_SRC) $(CSS) $(EXTRA_SRC)
 
 # generate A4 docs
 PAPER_LOCALE = nl_NL
@@ -79,9 +79,9 @@ debug:
 	@echo "PDF_DAT:  '$(PDF_DAT)'"
 
 # a rule to copy all of the source for docs into $(builddir)/build
-$(BUILDDIR)/$(MAIN): $(XML) $(CSS) $(EXTRA_SOURCES)
+$(BUILDDIR)/$(MAIN): $(XML) $(CSS) $(EXTRA_SRC)
 	@-mkdir -p $(BUILDDIR)
-	@if test "x$(EXTRA_SOURCES)" != "x"; then for a in $(EXTRA_SOURCES); do cp $(srcdir)/$$a $(BUILDDIR); done; fi
+	@if test "x$(EXTRA_SRC)" != "x"; then for a in $(EXTRA_SRC); do cp $(srcdir)/$$a $(BUILDDIR); done; fi
 	@for a in $(XML); do cp $(srcdir)/$$a $(BUILDDIR); done
 	@for a in $(CSS); do cp $(srcdir)/$$a $(BUILDDIR); done
 	@cp ../version.entities $(BUILDDIR)
diff --git a/docs/pwg/Makefile.am b/docs/pwg/Makefile.am
index 414f2dbd1b..fa5e63bb2b 100644
--- a/docs/pwg/Makefile.am
+++ b/docs/pwg/Makefile.am
@@ -17,7 +17,7 @@ PNG_SRC =
 FIG_SRC = $(notdir $(wildcard $(srcdir)/*.fig))
 
 # extra sources to copy in build directory
-EXTRA_SOURCES = 
+EXTRA_SRC = 
 
 ### this is the generic bit and you shouln't need to change this
 
diff --git a/gst/Makefile.am b/gst/Makefile.am
index b609eb401d..474636000a 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -17,7 +17,7 @@ endif
 if GST_DISABLE_PARSE
 GST_PARSE_SRC = 
 GST_PARSE_DIRS = 
-GST_PARSE_LIBADD = 
+# GST_PARSE_LIBADD = 
 else
 GST_PARSE_SRC = gstparse.c
 GST_PARSE_DIRS = parse
@@ -33,7 +33,7 @@ endif
 if GST_DISABLE_REGISTRY
 GST_REGISTRY_SRC = 
 GST_REGISTRY_DIRS =
-GST_REGISTRY_LIBADD = 
+# GST_REGISTRY_LIBADD = 
 else
 GST_REGISTRY_SRC = gstregistry.c
 GST_REGISTRY_DIRS = registries