diff --git a/common.mak b/common.mak
index eeeb6f54f8..20d32ed835 100644
--- a/common.mak
+++ b/common.mak
@@ -19,7 +19,6 @@ endif
 ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
 
 CPPFLAGS += -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH)
-CFLAGS := $(OPTFLAGS)
 
 %.o: %.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
diff --git a/configure b/configure
index 34aba9149e..41ef72fe06 100755
--- a/configure
+++ b/configure
@@ -2485,7 +2485,7 @@ enabled stripping &&
     echo "STRIP=echo ignoring strip" >> config.mak
 
 echo "CPPFLAGS?=$CPPFLAGS" >> config.mak
-echo "OPTFLAGS=$CFLAGS" >> config.mak
+echo "CFLAGS=$CFLAGS" >> config.mak
 echo "LDFLAGS=$LDFLAGS" >> config.mak
 echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
 echo "SHFLAGS=$SHFLAGS" >> config.mak