diff --git a/configure.ac b/configure.ac
index b00092bedd8eb4fbb25b6e3c597024168dbb117a..551cddf685a6675e021c9a0188252f01fbb7286a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AC_PROG_LIBTOOL
 DC_DOVECOT
 DC_DOVECOT_MODULEDIR
 LIBDOVECOT_INCLUDE="$LIBDOVECOT_INCLUDE $LIBDOVECOT_STORAGE_INCLUDE"
-CFLAGS="$DOVECOT_CFLAGS -I\$(top_srcdir)"
+CFLAGS="$CFLAGS -I\$(top_srcdir)"
 LIBS="$DOVECOT_LIBS"
-BINARY_CFLAGS="$DOVECOT_BINARY_CFLAGS"
-BINARY_LDFLAGS="$DOVECOT_BINARY_LDFLAGS"
+BINARY_LDFLAGS="$PIE_LDFLAGS $RELRO_LDFLAGS"
+BINARY_CFLAGS="$PIE_CFLAGS"
 AC_SUBST(BINARY_CFLAGS)
 AC_SUBST(BINARY_LDFLAGS)
 AC_SUBST(LIBDOVECOT_INCLUDE)