diff --git a/.gitignore b/.gitignore
index 87655c3..35f651c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ offlineimap-6.1.2.tar.gz
 /offlineimap-6.5.2.1-dont-sync-folders-with-empty-names.patch
 /OfflineIMAP-offlineimap-v6.5.5-rc3-0-g254e848.tar.gz
 /OfflineIMAP-offlineimap-v6.5.5-0-g8bc2f35.tar.gz
+/0001-Update-version-to-reflect-6.5.6.patch
diff --git a/offlineimap.spec b/offlineimap.spec
index 02595e5..eac3a86 100644
--- a/offlineimap.spec
+++ b/offlineimap.spec
@@ -8,17 +8,18 @@
 
 %define githash  8bc2f35
 %define packagedirprefix OfflineIMAP-offlineimap
-%define packagedirname %{packagedirprefix}-%{githash}
+%define packagedirname %{name}-%{version}
 
 Name:           offlineimap
-Version:        6.5.5
-Release:        2%{?dist}
+Version:        6.5.6
+Release:        1%{?dist}
 Summary:        Powerful IMAP/Maildir synchronization and reader support
 
 License:        GPLv2+
 Group:          Applications/Internet
 URL:            http://offlineimap.org
-Source0:        %{packagedirprefix}-v%{version}-0-g%{githash}.tar.gz
+Source0:        %{packagedirprefix}-v%{version}.tar.gz
+Patch1:         0001-Update-version-to-reflect-6.5.6.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -42,7 +43,8 @@ reader that does not have IMAP support, has poor IMAP support, or does
 not provide disconnected operation.
 
 %prep
-%setup -q -n %{packagedirname}
+%setup -q
+%patch1 -p1
 
 %build
 make build
@@ -72,6 +74,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/offlineimap.1.gz
 
 %changelog
+* Sun Jan  4 2015  <dodji@seketeli.org> - 6.5.6-1
+- Update to upstream version 6.5.6
+- Adjust the packagedirname macro to the normal naming (non git-pre-release) scheme
+- Adjust the Source0 macro to the normal naming scheme
+- Now that the name of the extracted source director is normal,
+  simplify %%setup rule.
+- Add the 0001-Update-version-to-reflect-6.5.6.patch to make the
+  version of offlineimap as returned by 'offlineimap --version' be
+  6.5.6, as opposed to 6.5.5
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.5.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 33f76ab..19f6816 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-b8524e33541fbac1d131da42cc440576  OfflineIMAP-offlineimap-v6.5.5-rc3-0-g254e848.tar.gz
-2a0538e43edb4b2a92170d0437937d30  OfflineIMAP-offlineimap-v6.5.5-0-g8bc2f35.tar.gz
+a5d64a41f8eb9b34bd718589747e49de  0001-Update-version-to-reflect-6.5.6.patch