diff --git a/crda.spec b/crda.spec
index 6b1fcd3..297f00c 100644
--- a/crda.spec
+++ b/crda.spec
@@ -3,7 +3,7 @@
 
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
@@ -15,7 +15,6 @@ BuildRequires:  kernel-headers >= 2.6.27
 BuildRequires:  libnl-devel >= 1.1
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig python m2crypto
-BuildRequires:  gzip
 
 Requires:       udev, iw
 
@@ -46,14 +45,14 @@ communication from the kernel.
 # Use our own signing key to generate regulatory.bin
 cd wireless-regdb-%{regdb_version}
 
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" maintainer-clean
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" REGDB_PRIVKEY=key.priv.pem REGDB_PUBKEY=key.pub.pem
+make %{?_smp_mflags} CFLAGS="%{optflags}" maintainer-clean
+make %{?_smp_mflags} CFLAGS="%{optflags}" REGDB_PRIVKEY=key.priv.pem REGDB_PUBKEY=key.pub.pem
 
 # Build CRDA using the new key and regulatory.bin from above
 cd ../crda-%{crda_version}
 cp ../wireless-regdb-%{regdb_version}/key.pub.pem pubkeys
 
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" REG_BIN=../wireless-regdb-%{regdb_version}/regulatory.bin
+make %{?_smp_mflags} CFLAGS="%{optflags}" REG_BIN=../wireless-regdb-%{regdb_version}/regulatory.bin
 
 
 %install
@@ -67,13 +66,8 @@ cd ../wireless-regdb-%{regdb_version}
 cp README README.wireless-regdb
 make install DESTDIR=%{buildroot} PREFIX='' MANDIR=%{_mandir}
 
-install -d %{buildroot}/sbin
-install -pm 0755 %SOURCE2 %{buildroot}/sbin
-
-cd ..
-/usr/bin/gzip -c %SOURCE3 > %{SOURCE3}.gz
-install -d %{buildroot}%{_mandir}/man1
-install -pm 0644 %{SOURCE3}.gz %{buildroot}%{_mandir}/man1
+install -D -pm 0755 %SOURCE2 %{buildroot}/sbin
+install -D -pm 0644 %SOURCE3 %{buildroot}%{_mandir}/man1/setregdomain.1
 
 
 %clean
@@ -87,16 +81,21 @@ rm -rf %{buildroot}
 /sbin/setregdomain
 /lib/udev/rules.d/85-regulatory.rules
 /lib/%{name}
-%{_mandir}/man1/setregdomain.1.gz
-%{_mandir}/man5/regulatory.bin.5.gz
-%{_mandir}/man8/crda.8.gz
-%{_mandir}/man8/regdbdump.8.gz
+%{_mandir}/man1/setregdomain.1*
+%{_mandir}/man5/regulatory.bin.5*
+%{_mandir}/man8/crda.8*
+%{_mandir}/man8/regdbdump.8*
 %doc crda-%{crda_version}/LICENSE crda-%{crda_version}/README.crda
 %doc wireless-regdb-%{regdb_version}/README.wireless-regdb
 
 
 %changelog
-* Tue Dec 21 2009 John W. Linville <linville@redhat.com> 1.1.1_2009.11.25-1
+* Tue Jan 26 2009 John W. Linville <linville@redhat.com> 1.1.1_2009.11.25-2
+- Change RPM_OPT_FLAGS to optflags
+- Leave man page compression to rpmbuild
+- Correct date in previous changelog entry
+
+* Tue Jan 26 2009 John W. Linville <linville@redhat.com> 1.1.1_2009.11.25-1
 - Update for crda version 1.1.1
 
 * Tue Dec 21 2009 John W. Linville <linville@redhat.com> 1.1.0_2009.11.25-5