diff --git a/configure.ac b/configure.ac
index 9ba3eb84..5f995a86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,6 +154,8 @@ openssl)
         AC_DEFINE([USE_OPENSSL_CRYPTO_LIBRARY],
                   [1],
                   [use openssl crypto library])
+	LIBCRYPTO_EXTRA_CFLAGS="-DOPENSSL_SUPPRESS_DEPRECATED"
+	AC_SUBST([LIBCRYPTO_EXTRA_CFLAGS])
 	;;
 esac
 
@@ -320,7 +322,7 @@ if test "x$enable_hardening" != "xno"; then
 fi
 
 AM_CFLAGS="$CFLAGS $COVERAGE_CFLAGS -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign -Wmissing-prototypes"
-AM_CFLAGS="$AM_CFLAGS -Wno-deprecated-declarations"
+AM_CFLAGS="$AM_CFLAGS"
 AM_LDFLAGS="$LDFLAGS $COVERAGE_LDFLAGS"
 
 AC_SUBST([AM_CFLAGS])
diff --git a/src/Makefile.am b/src/Makefile.am
index 274f01ad..c2759a84 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,8 @@ common_CFLAGS = -include tpm_library_conf.h \
 		$(AM_CFLAGS) \
                 $(HARDENING_CFLAGS) \
                $(SANITIZERS) \
-               $(FUZZER)
+               $(FUZZER) \
+               $(LIBCRYPTO_EXTRA_CFLAGS)
 
 # build with libtpms callback support
 common_CFLAGS += -DTPM_LIBTPMS_CALLBACKS