diff --git a/alpine.spec b/alpine.spec
index 61e189b..ac14b46 100644
--- a/alpine.spec
+++ b/alpine.spec
@@ -91,11 +91,6 @@ install -m644 -p %{SOURCE1} .
 
 %build
 touch imap/ip6
-
-# Add -std=gnu17 for now.
-# https://bugzilla.redhat.com/show_bug.cgi?id=2336274
-CFLAGS="%{optflags} -std=gnu17"
-
 # --without-tcl disables the TCL-based CGI "Web Alpine"
 %configure \
   --enable-debug=no \
@@ -113,7 +108,7 @@ CFLAGS="%{optflags} -std=gnu17"
 
 # Build single threaded, make is not creating directories in time.
 export RPM_BUILD_NCPUS=1
-%make_build
+%make_build EXTRACFLAGS="$RPM_OPT_FLAGS"
 
 
 %install