diff --git a/highlight.spec b/highlight.spec
index 146c228..3bd5b78 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -10,6 +10,8 @@ License:        GPLv3
 URL:            http://www.andre-simon.de/
 Source0:        http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
 
+Source20: qmake-qt4.sh
+
 BuildRequires:  qt-devel >= 1:4.4
 BuildRequires:  lua-devel, boost-devel
 # Only required for 3.16.1
@@ -40,11 +42,18 @@ A Qt-based GUI for the highlight source code formatter source.
 %setup -q
 
 %build
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="%{?__global_ldflags}"
-rm -rf src/gui-qt/moc*
-make gui %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"  \
-                         QMAKE="qmake-qt4" \
-                         LDFLAGS="%{?__global_ldflags}"
+CFLAGS="%{optflags}"; export CFLAGS
+CXXFLAGS="%{optflags}"; export CXXFLAGS
+LDFLAGS="%{?__global_ldflags}"; export LDFLAGS
+
+# force use of custom/local qmake, to inject proper build flags (above)
+install -m755 -D %{SOURCE20} bin/qmake-qt4
+PATH=`pwd`/bin:%{_qt4_bindir}:$PATH; export PATH
+which qmake-qt4
+
+make all gui %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"  \
+                     LDFLAGS="%{?__global_ldflags}" \
+                     QMAKE="qmake-qt4"
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
diff --git a/qmake-qt4.sh b/qmake-qt4.sh
new file mode 100755
index 0000000..9eac28c
--- /dev/null
+++ b/qmake-qt4.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+/usr/bin/qmake-qt4 \
+  $@ \
+  QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
+  QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
+  QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
+  QMAKE_STRIP=