diff --git a/openldap2-client.changes b/openldap2-client.changes
index 16eff0e..d00f086 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb  8 13:24:49 UTC 2016 - mpluskal@suse.com
+
+- Use optflags when building
+
 -------------------------------------------------------------------
 Sat Feb  6 12:10:53 UTC 2016 - michael@stroeder.com
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index 4e719ef..1b7868d 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -221,11 +221,7 @@ This package contains the OpenLDAP client libraries.
 cp %{SOURCE5} .
 
 %build
-# %{?suse_update_config:%{suse_update_config -f build}}
-#libtoolize --force
-#autoreconf
-# export CFLAGS="${RPM_OPT_FLAGS} -Wno-format-extra-args -fno-strict-aliasing -DNDEBUG -DSLAP_CONFIG_DELETE -DSLAP_SCHEMA_EXPOSE -DLDAP_COLLECTIVE_ATTRIBUTES"
-export CFLAGS="-Wno-format-extra-args -fno-strict-aliasing -DNDEBUG -DSLAP_CONFIG_DELETE -DSLAP_SCHEMA_EXPOSE -DLDAP_COLLECTIVE_ATTRIBUTES"
+export CFLAGS="%{optflags} -Wno-format-extra-args -fno-strict-aliasing -DNDEBUG -DSLAP_CONFIG_DELETE -DSLAP_SCHEMA_EXPOSE -DLDAP_COLLECTIVE_ATTRIBUTES"
 export STRIP=""
 ./configure \
         --prefix=/usr \
diff --git a/openldap2.changes b/openldap2.changes
index 16eff0e..d00f086 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb  8 13:24:49 UTC 2016 - mpluskal@suse.com
+
+- Use optflags when building
+
 -------------------------------------------------------------------
 Sat Feb  6 12:10:53 UTC 2016 - michael@stroeder.com
 
diff --git a/openldap2.spec b/openldap2.spec
index b32edf4..49fb757 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -221,11 +221,7 @@ This package contains the OpenLDAP client libraries.
 cp %{SOURCE5} .
 
 %build
-# %{?suse_update_config:%{suse_update_config -f build}}
-#libtoolize --force
-#autoreconf
-# export CFLAGS="${RPM_OPT_FLAGS} -Wno-format-extra-args -fno-strict-aliasing -DNDEBUG -DSLAP_CONFIG_DELETE -DSLAP_SCHEMA_EXPOSE -DLDAP_COLLECTIVE_ATTRIBUTES"
-export CFLAGS="-Wno-format-extra-args -fno-strict-aliasing -DNDEBUG -DSLAP_CONFIG_DELETE -DSLAP_SCHEMA_EXPOSE -DLDAP_COLLECTIVE_ATTRIBUTES"
+export CFLAGS="%{optflags} -Wno-format-extra-args -fno-strict-aliasing -DNDEBUG -DSLAP_CONFIG_DELETE -DSLAP_SCHEMA_EXPOSE -DLDAP_COLLECTIVE_ATTRIBUTES"
 export STRIP=""
 ./configure \
         --prefix=/usr \