diff --git a/pcmciautils-fedora.patch b/pcmciautils-fedora.patch
index 7dc4dd9..105db56 100644
--- a/pcmciautils-fedora.patch
+++ b/pcmciautils-fedora.patch
@@ -30,7 +30,7 @@
 -endif
 +LIB_OBJS =  -Wl,-Bstatic -lsysfs -Wl,-Bdynamic
 +LIB_PCI_OBJS =  -lpci
-+CFLAGS  += $(OPTIMIZATION) -D_GNU_SOURCE
++CFLAGS  += $(RPM_OPT_FLAGS) $(OPTIMIZATION) -D_GNU_SOURCE
 +LDFLAGS += -Wl,-warn-common
 +STRIPCMD = /bin/true
  
diff --git a/pcmciautils.spec b/pcmciautils.spec
index eb29f19..c4d97fc 100644
--- a/pcmciautils.spec
+++ b/pcmciautils.spec
@@ -2,13 +2,16 @@ Name: pcmciautils
 Summary: PCMCIA utilities and initialization programs
 License: GPL
 Version: 014
-Release: 5
+Release: 6%{?dist}
 Group: System Environment/Base
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64
+URL: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html
 Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2
-Obsoletes: pcmcia-cs
-Obsoletes: kernel-pcmcia-cs
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Obsoletes: pcmcia-cs < 3.2.9
+Obsoletes: kernel-pcmcia-cs < 3.1.32
+Provides:  pcmcia-cs = 3.2.9
+Provides:  kernel-pcmcia-cs = 3.1.32
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libsysfs-devel >= 1.3.0
 Requires: udev >= 062, kernel >= 2.6.12-1.1411_FC5
 BuildRequires: byacc, flex
@@ -26,7 +29,7 @@ debugging PCMCIA and Cardbus sockets.
 %patch2 -p1
 
 %build
-make
+make %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -38,11 +41,19 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/pcmcia/*.opts
-/etc/udev/rules.d/*
-/sbin/*
-%{_mandir}/man*/*
+%dir %{_sysconfdir}/pcmcia
+%config(noreplace) %attr(0644,root,root) /etc/udev/rules.d/*
+/sbin/pccardctl
+%attr(0755,root,root) /sbin/lspcmcia
+%attr(0755,root,root) /sbin/pcmcia-check-broken-cis
+%attr(0755,root,root) /sbin/pcmcia-socket-startup
+%{_mandir}/man*/lspcmcia*
+%{_mandir}/man*/pccardctl*
 
 %changelog
+* Fri Mar 23 2007 Harald Hoyer <harald@redhat.com> - 014-6%{?dist}
+- specfile cleanup
+
 * Mon Jul 17 2006 Jesse Keating <jkeating@redhat.com> - 014-5
 - rebuild
 - change br sysfsutils-devel to libsysfs-devel