diff --git a/build/autogen.sh b/build/autogen.sh
index d82a401..e731624 100755
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -48,6 +48,11 @@
 perl -p -i -e 's/(m4_define\(\[LIBARCHIVE_VERSION_S\]),.*\)/$1,['"$VS"'])/' configure.ac
 perl -p -i -e 's/(m4_define\(\[LIBARCHIVE_VERSION_N\]),.*\)/$1,['"$VN"'])/' configure.ac
 
+# Remove developer CFLAGS if a release build is being made
+if [ -n "${MAKE_LIBARCHIVE_RELEASE}" ]; then
+  perl -p -i -e "s/^(DEV_CFLAGS.*)/# \$1/" Makefile.am
+fi
+
 set -xe
 aclocal -I build/autoconf
 
diff --git a/build/makerelease.sh b/build/makerelease.sh
index a8aa23b..f2869df 100755
--- a/build/makerelease.sh
+++ b/build/makerelease.sh
@@ -46,6 +46,7 @@
 #
 # Construct and verify the autoconf build system
 #
+export MAKE_LIBARCHIVE_RELEASE="1"
 /bin/sh build/autogen.sh
 
 # Get the newest config.guess/config.sub from savannah.gnu.org