diff --git a/ChangeLog b/ChangeLog
index 7939586bc6..01e3902caa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-03  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Loïc Minier <lool+gnome at via ecp fr>
+
+	* ext/libcaca/Makefile.am:
+	* gst/debug/Makefile.am:
+	  Don't mix tabs and spaces (#414168).
+
 2007-03-02  Stefan Kost  <ensonic@users.sf.net>
 
 	* tests/check/generic/.cvsignore:
diff --git a/ext/libcaca/Makefile.am b/ext/libcaca/Makefile.am
index 4155803e0a..9867115a90 100644
--- a/ext/libcaca/Makefile.am
+++ b/ext/libcaca/Makefile.am
@@ -7,7 +7,7 @@ libgstcacasink_la_CFLAGS = \
 	$(LIBCACA_CFLAGS)
 libgstcacasink_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) \
- 	$(GST_BASE_LIBS) \
+	$(GST_BASE_LIBS) \
 	$(LIBCACA_LIBS)
 libgstcacasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
diff --git a/gst/debug/Makefile.am b/gst/debug/Makefile.am
index 3dff152436..6eceb03fb6 100644
--- a/gst/debug/Makefile.am
+++ b/gst/debug/Makefile.am
@@ -1,7 +1,7 @@
 if GST_HAVE_MMAP
-  EFENCE_PLUGIN=libgstefence.la
+EFENCE_PLUGIN=libgstefence.la
 else
-  EFENCE_PLUGIN=
+EFENCE_PLUGIN=
 endif
 
 plugin_LTLIBRARIES = $(EFENCE_PLUGIN) libgstdebug.la libgstnavigationtest.la 
@@ -25,17 +25,17 @@ libgstnavigationtest_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
 libgstnavigationtest_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(LIBM)
 libgstnavigationtest_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
- 
+
 libgstdebug_la_SOURCES = \
 	gstdebug.c \
- 	breakmydata.c \
- 	progressreport.c \
- 	progressreport.h \
+	breakmydata.c \
+	progressreport.c \
+	progressreport.h \
 	gstnavseek.c \
 	gstpushfilesrc.c \
 	gstpushfilesrc.h \
- 	tests.c \
- 	testplugin.c
+	tests.c \
+	testplugin.c
 # 	negotiation.c
 
 libgstdebug_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)