diff --git a/ChangeLog b/ChangeLog
index eb3dcdfdfb..3f23af6f9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/prog-cc.m4: Add CPPFLAGS and CFLAGS handling to
+	RTEMS_PROG_CC_FOR_TARGET.
+
 2001-04-26	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* README.cdn-X: Update.
diff --git a/aclocal/prog-cc.m4 b/aclocal/prog-cc.m4
index 164934ba51..868c411b21 100644
--- a/aclocal/prog-cc.m4
+++ b/aclocal/prog-cc.m4
@@ -38,6 +38,12 @@ if test "$RTEMS_USE_GCC272" != "yes" ; then
 fi
 test "$rtems_cv_gcc_pipe" = "yes" && CC="$CC --pipe"
 
+if test "$GCC" = yes; then
+]
+ifelse([$1],,[],[CPPFLAGS="$CPPFLAGS $1"])
+[
+CFLAGS="-g -Wall"
+fi
 ## Conditional for automake files
 AM_CONDITIONAL(RTEMS_USE_GCC272, test x"$RTEMS_USE_GCC272" = x"yes")
 ## Make variable for autoconf fragments (*.cfg)