diff --git a/csstidy-1.4-optflags.patch b/csstidy-1.4-optflags.patch
new file mode 100644
index 0000000..e69ca9a
--- /dev/null
+++ b/csstidy-1.4-optflags.patch
@@ -0,0 +1,13 @@
+diff -up csstidy-1.4/SConstruct~ csstidy-1.4/SConstruct
+--- csstidy-1.4/SConstruct~	2007-07-10 18:20:54.000000000 +0300
++++ csstidy-1.4/SConstruct	2009-04-30 20:31:48.000000000 +0300
+@@ -13,7 +13,8 @@ if not (mymode in ['debug', 'release']):
+ print '**** Compiling in ' + mymode + ' mode...'
+ 
+ debugcflags = ['-Wall', '-g', '-pedantic']   #extra compile flags for debug
+-releasecflags = ['-O2']         #extra compile flags for release
++import os
++releasecflags = os.getenv('RPM_OPT_FLAGS').split() #extra compile flags for release
+ 
+ env = Environment()
+ 
diff --git a/csstidy.spec b/csstidy.spec
index ab1fe85..e89eac1 100644
--- a/csstidy.spec
+++ b/csstidy.spec
@@ -1,6 +1,6 @@
 Name:           csstidy
 Version:        1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CSS parser and optimizer
 
 Group:          Applications/Internet
@@ -14,6 +14,7 @@ URL:            http://csstidy.sourceforge.net
 #   cd ..; tar czf csstidy-%{version}.tar.gz csstidy-%{version}
 Source0:        csstidy-%{version}.tar.gz
 Patch0:         csstidy-1.4-fix-misc.cpp.patch
+Patch1:         csstidy-1.4-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-c++ scons
@@ -27,10 +28,11 @@ support and a higher reliability.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
-scons
+scons %{?_smp_mflags}
 
 
 %install
@@ -50,6 +52,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Apr 30 2009 Ville Skyttä <ville.skytta@iki.fi> - 1.4-3
+- Build with %%{optflags}, %%{_smp_mflags} (#498487).
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild