diff --git a/configure b/configure
index 44551781e..898717afe 100755
--- a/configure
+++ b/configure
@@ -1964,7 +1964,7 @@ LIBUNBOUND_AGE=0
 
 
 
-CFLAGS=
+CFLAGS="$CFLAGS"
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/configure.ac b/configure.ac
index a1e63f5e4..2a7f9ed8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_SUBST(LIBUNBOUND_CURRENT)
 AC_SUBST(LIBUNBOUND_REVISION)
 AC_SUBST(LIBUNBOUND_AGE)
 
-CFLAGS=
+CFLAGS="$CFLAGS"
 AC_AIX
 
 dnl
diff --git a/doc/Changelog b/doc/Changelog
index c32a9c387..7f16a7ebb 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+22 October 2008: Wouter
+	- CFLAGS are picked up by configure from the environment.
+
 21 October 2008: Wouter
 	- fix update-anchors.sh, so it does not report different RR order
 	  as an update.  Sorts the keys in the file.  Updated copyright.