diff --git a/configure-libafs.ac b/configure-libafs.ac
index 8e8e28afa6..86a2220862 100644
--- a/configure-libafs.ac
+++ b/configure-libafs.ac
@@ -14,7 +14,10 @@ AC_SUBST(MACOS_VERSION)
 AC_SUBST(LINUX_PKGVER)
 AC_SUBST(LINUX_PKGREL)
 
+dnl If the user hasn't specified CFLAGS don't let configure pick -g -O2
+AS_IF([test -z "$CFLAGS"], [CFLAGS=" "], [])
 AC_PROG_CC
+
 OPENAFS_CONFIGURE_COMMON
 
 AC_OUTPUT(             \
diff --git a/configure.ac b/configure.ac
index ec597a4bec..aa8e359187 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,11 @@ AC_SUBST(LINUX_PKGREL)
 AC_SUBST(DEB_PKGVER)
 
 AC_USE_SYSTEM_EXTENSIONS
+
+dnl If the user hasn't specified CFLAGS don't let configure pick -g -O2
+AS_IF([test -z "$CFLAGS"], [CFLAGS=" "], [])
 AC_PROG_CC
+
 AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib])
 AC_SUBST([PATH_CPP])
 OPENAFS_CONFIGURE_COMMON