diff --git a/ccid.spec b/ccid.spec
index 5392c24..c96f291 100644
--- a/ccid.spec
+++ b/ccid.spec
@@ -1,6 +1,6 @@
-%define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null)
-%define pcsc_lite_ver 1.6.2
-%define upstream_build 3333
+%global dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null)
+%global pcsc_lite_ver 1.6.2
+%global upstream_build 3333
 
 Name:           ccid
 Version:        1.4.0
@@ -32,7 +32,7 @@ Generic USB CCID (Chip/Smart Card Interface Devices) driver.
 
 
 %build
-%configure --disable-dependency-tracking --disable-static --enable-twinserial --enable-udev
+%configure --enable-twinserial --enable-udev
 make %{?_smp_mflags}
 
 
@@ -40,8 +40,7 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT/usr/share/doc/ccid/README_Kobil_mIDentity_switch.txt ./
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d
-%{__install} -m 644 src/pcscd_ccid.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/85-pcscd_ccid.rules
+install -Dpm 644 src/pcscd_ccid.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/85-pcscd_ccid.rules
 
 
 %clean
@@ -65,10 +64,9 @@ exit 0
 %config %{_sysconfdir}/reader.conf.d/libccidtwin
 %config %{_sysconfdir}/udev/rules.d/85-pcscd_ccid.rules
 %{_bindir}/RSA_SecurID_getpasswd
-%{_mandir}/man1/RSA_SecurID_getpasswd.1.gz
-%{_mandir}/man8/Kobil_mIDentity_switch.8.gz
+%{_mandir}/man1/RSA_SecurID_getpasswd.1*
+%{_mandir}/man8/Kobil_mIDentity_switch.8*
 %{_sbindir}/Kobil_mIDentity_switch
-#%doc /doc/ccid/
 
 
 %changelog
@@ -76,6 +74,7 @@ exit 0
 - Update to 1.4.0
 - Build against libusb1 instead of libusb 0.1
 - Install libccidtwin configuration file
+- Spec file clean up
 
 * Sun Jul 04 2010 Kalev Lember <kalev@smartlink.ee> - 1.3.13-1
 - Update to 1.3.13