diff --git a/ChangeLog b/ChangeLog
index b0c0290..09ed101 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@ consistent with CFLAGS.
 each rzip chunk and compressed block.
 * Modify purpose of -T threshold option to mean Disable LZO pre-compression
  testing. Threshold level test deprecated.
+* Make failure to allocate a buffer in the compress_ functions put out an
+error message always rather than just in max_verbose mode.
 
 FEBRUARY 2011, Peter Hyman
 * Minor updates to man pages, lrzip.conf example file.
diff --git a/Makefile.in b/Makefile.in
index a74081a..c6e7cf4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,8 +18,8 @@ LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@
 CC=@CC@
 CXX=@CXX@
-CFLAGS=@CFLAGS@ -I. -I$(srcdir) -c -s
-CXXFLAGS=@CXXFLAGS@ -I. -I$(srcdir) -c -s -Wall -W
+CFLAGS=@CFLAGS@ -I. -I$(srcdir) -c
+CXXFLAGS=@CXXFLAGS@ -I. -I$(srcdir) -c
 LZMA_CFLAGS=-I@top_srcdir@/lzma/C -DCOMPRESS_MF_MT -D_REENTRANT
 
 INSTALLCMD=@INSTALL@
diff --git a/configure b/configure
index 815b3fd..729dee4 100755
--- a/configure
+++ b/configure
@@ -3871,7 +3871,8 @@ fi
 
 
 if test x"$GCC" = xyes; then
-        CFLAGS="$CFLAGS -Wall -W"
+        CFLAGS="-Wall -W -s -O2 $CFLAGS"
+        CXXFLAGS="-Wall -W -s -O2 $CXXFLAGS"
 fi
 
 ac_ext=c
diff --git a/configure.ac b/configure.ac
index 989f6fc..9421ef4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,8 @@ AC_SUBST(SHELL)
 AC_SYS_LARGEFILE
 
 if test x"$GCC" = xyes; then
-        CFLAGS="$CFLAGS -Wall -W"
+        CFLAGS="-Wall -W -s -O2 $CFLAGS"
+        CXXFLAGS="-Wall -W -s -O2 $CXXFLAGS"
 fi
 
 AC_CHECK_HEADERS(fcntl.h sys/time.h sys/unistd.h unistd.h)