diff --git a/ChangeLog b/ChangeLog
index b7f3957c65..705b5637d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-10  Stefan Kost  <ensonic@users.sf.net>
+
+	* gst/Makefile.am:
+	* gst/gstconfig.h.in:
+	* win32/common/config.h:
+        Fix build when disabling tracing (fixes #344016). Also start to document
+        the defines that disable the sub-systems.
+
 2006-07-10  Edward Hervey  <edward@fluendo.com>
 
 	* gst/gst.c: (ensure_current_registry_forking):
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 922cd80883..eb3c69e4d1 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -26,8 +26,10 @@ endif
 
 if GST_DISABLE_TRACE
 GST_TRACE_SRC = 
+GST_TRACE_H = 
 else
 GST_TRACE_SRC = gsttrace.c
+GST_TRACE_H = gsttrace.h
 endif
 
 if GST_DISABLE_ENUMTYPES
@@ -91,7 +93,7 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
 	gstmessage.c		\
 	gstminiobject.c		\
 	gstpad.c		\
-        gstpadtemplate.c	\
+	gstpadtemplate.c	\
 	gstpipeline.c		\
 	gstplugin.c		\
 	gstpluginfeature.c	\
@@ -183,7 +185,7 @@ gst_headers =			\
 	gsttaglist.h		\
 	gsttagsetter.h		\
 	gsttask.h		\
-	gsttrace.h		\
+	$(GST_TRACE_H)		\
 	gsttypefind.h		\
 	gsttypefindfactory.h	\
 	gsturi.h		\
@@ -198,7 +200,8 @@ nodist_libgstreamer_@GST_MAJORMINOR@include_HEADERS = \
 	$(built_header_configure) $(built_header_make)
 
 EXTRA_DIST = \
-	gstparse.h
+	gstparse.h \
+        gsttrace.h
 
 noinst_HEADERS = 		\
 	gettext.h		\
diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in
index d63068928b..9fc066f429 100644
--- a/gst/gstconfig.h.in
+++ b/gst/gstconfig.h.in
@@ -76,22 +76,31 @@
 
 /***** disabling of subsystems *****/
 
-/* wether or not the debugging subsystem is enabled */
+/* configures the inclusion of the debugging subsystem */
 @GST_DISABLE_GST_DEBUG_DEFINE@
 
-/* DOES NOT WORK */
+/* configures the inclusion of the plugin graph xml-serialisation 
+ * (was used in 0.8 by gst-editor)
+ */
 @GST_DISABLE_LOADSAVE_DEFINE@
 
-/* DOES NOT WORK */
+/* configures the inclusion of the gst-lauch parser */
 @GST_DISABLE_PARSE_DEFINE@
 
-/* DOES NOT WORK */
+/* configures the inclusion of a resource tracing facillity
+ * (seems to be unused)
+ */
 @GST_DISABLE_TRACE_DEFINE@
 
-/* DOES NOT WORK */
+/* configures the use of a memory tracer based on the resource tracer
+ * if TRACE is disabled, ALLOC_TRACE is disabled as well
+ */
 @GST_DISABLE_ALLOC_TRACE_DEFINE@
 
-/* DOES NOT WORK */
+/* configures the use of the plugin registry
+ * if one disables this, required plugins need to be loaded and registered
+ * manualy
+ */
 @GST_DISABLE_REGISTRY_DEFINE@
 
 /* DOES NOT WORK */
diff --git a/win32/common/config.h b/win32/common/config.h
index 1a513ea0d2..090fb2314b 100644
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -175,7 +175,7 @@
 #define HAVE_WIN32 1
 
 /* Define host CPU */
-#define HOST_CPU "powerpc"
+#define HOST_CPU "i686"
 
 /* library dir */
 #ifdef _DEBUG