diff --git a/ccid.spec b/pcsc-lite-ccid.spec
similarity index 94%
rename from ccid.spec
rename to pcsc-lite-ccid.spec
index f40893b..5c2dea7 100644
--- a/ccid.spec
+++ b/pcsc-lite-ccid.spec
@@ -2,15 +2,15 @@
 %global pcsc_lite_ver 1.6.2
 %global upstream_build 3333
 
-Name:           ccid
+Name:           pcsc-lite-ccid
 Version:        1.4.0
-Release:        2%{dist}
+Release:        3%{dist}
 Summary:        Generic USB CCID smart card reader driver
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://pcsclite.alioth.debian.org/ccid.html
-Source0:        http://alioth.debian.org/download.php/%{upstream_build}/%{name}-%{version}.tar.bz2
+Source0:        http://alioth.debian.org/download.php/%{upstream_build}/ccid-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb1-devel
@@ -19,6 +19,9 @@ Requires(post): initscripts
 Requires(postun): initscripts
 Requires:       pcsc-lite >= %{pcsc_lite_ver}
 Provides:       pcsc-ifd-handler
+# Provide upgrade path from 'ccid' package
+Obsoletes:      ccid < 1.4.0-3
+Provides:       ccid = %{version}-%{release}
 
 %description
 Generic USB CCID (Chip/Smart Card Interface Devices) driver for use with the
@@ -26,7 +29,7 @@ PC/SC Lite daemon.
 
 
 %prep
-%setup -q
+%setup -q -n ccid-%{version}
 
 
 %build
@@ -68,6 +71,9 @@ exit 0
 
 
 %changelog
+* Tue Dec 07 2010 Kalev Lember <kalev@smartlink.ee> - 1.4.0-3
+- Renamed ccid package to pcsc-lite-ccid (#654377)
+
 * Tue Dec 07 2010 Kalev Lember <kalev@smartlink.ee> - 1.4.0-2
 - Removed ExcludeArch: s390 s390x as these arches now have libusb1
 - Updated description