diff --git a/mosquitto.spec b/mosquitto.spec
index 5f4ab87..eef96ea 100644
--- a/mosquitto.spec
+++ b/mosquitto.spec
@@ -47,10 +47,12 @@ Python bindings for %{name}
 rm -r src/uthash.h
 # Set the install prefix to /usr
 sed -i "s|prefix=/usr/local|prefix=/usr|" config.mk
+# Don't strip binaries on install: rpmbuild will take care of it
+sed -i "s|(INSTALL) -s|(INSTALL)|g" lib/Makefile src/Makefile client/Makefile
 
 %build
 export CFLAGS="%{optflags}"
-export LDFLAGS="%{__global_ldflags} -Wl,--as-needed"
+export LDFLAGS="%{optflags} %{__global_ldflags} -Wl,--as-needed"
 make all %{?_smp_mflags}
 
 pushd lib/python