diff --git a/src/post_modules/GTK2/Makefile.in b/src/post_modules/GTK2/Makefile.in
index ee768c165314cb22ce980bcc8b2f40fe237eff23..c893569d800f225df845c18c961ab0e36043d8a6 100644
--- a/src/post_modules/GTK2/Makefile.in
+++ b/src/post_modules/GTK2/Makefile.in
@@ -51,9 +51,9 @@ compile1:
 	  done; \
 	else :; fi
 	@echo "Original CFLAGS:$(CFLAGS)"
-	@echo "Modified CFLAGS:`echo $(CFLAGS) | sed -e 's/-g[^ ]*//g' -e 's/-W[^ ]*//g'`"
+	@echo "Modified CFLAGS:`echo ' $(CFLAGS) ' | sed -e 's/ -g[^ ]*//g' -e 's/ -W[^ ]*//g'` `echo ' $(CFLAGS) ' | sed -ne 's/.*\( -gcc-version[^ ]*\).*/\1/p'`"
 	@$(MAKE) OBJS="`cat files_to_compile`" \
-	         CFLAGS="`echo $(CFLAGS) | sed -e 's/ -g[^ ]*/ /g' -e 's/ -W[^ ]*/ /g'`" \
+	         CFLAGS="`echo ' $(CFLAGS) ' | sed -e 's/ -g[^ ]*/ /g' -e 's/ -W[^ ]*/ /g'` `echo ' $(CFLAGS) ' | sed -ne 's/.*\( -gcc-version[^ ]*\).*/\1/p'`" \
 	         all
 
 compile2: compile1
diff --git a/src/post_modules/GTK2/pgtk.h b/src/post_modules/GTK2/pgtk.h
index f46fc64679d8f62f604688ff847a04dba2bb8fb6..2e3d4f54924919324dc7f1d91cf9242a3ba27cf4 100644
--- a/src/post_modules/GTK2/pgtk.h
+++ b/src/post_modules/GTK2/pgtk.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: pgtk.h,v 1.15 2006/08/02 13:42:31 ldillon Exp $
+|| $Id: pgtk.h,v 1.16 2006/08/02 13:49:37 ldillon Exp $
 */
 
 /* Sort of unnessesary, and decreases code-size with 140Kb */