diff --git a/.gitignore b/.gitignore
index c2a396f..d38d74e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 imapfilter-2.0.11.tar.bz2
 /imapfilter-2.5.tar.gz
+/imapfilter-makefile-fix-v2.5.5.patch
+/imapfilter-2.5.5.tar.gz
diff --git a/imapfilter.spec b/imapfilter.spec
index 183ad5e..d4de037 100644
--- a/imapfilter.spec
+++ b/imapfilter.spec
@@ -1,14 +1,17 @@
 Name:           imapfilter
-Version:        2.5
-Release:        3%{?dist}
+Version:        2.5.5
+Release:        1%{?dist}
 Summary:        A flexible client side mail filtering utility for IMAP servers
 
 Group:          Applications/Internet
 License:        MIT
-URL:            http://imapfilter.hellug.gr/
-Source0:        https://github.com/downloads/lefcha/imapfilter/imapfilter-%{version}.tar.gz
-Patch0:         http://people.redhat.com/~dsommers/imapfilter/imapfilter-makefile-fix.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:            https://github.com/lefcha/imapfilter/
+# Thanks to githubs new regime, we're not given any extention on the download - but it is a tar.gz file.
+# Source URL https://codeload.github.com/lefcha/imapfilter/tar.gz/v%{version}
+# Download it and save it as imapfilter-%{version}.tar.gz
+# And yeah, rpmlint will complain.
+Source0:        imapfilter-%{version}.tar.gz
+Patch0:         http://people.redhat.com/~dsommers/imapfilter/imapfilter-makefile-fix-v2.5.5.patch
 
 BuildRequires:  openssl-devel lua-devel pcre-devel
 
@@ -22,8 +25,8 @@ protocol are supported.
 
 
 %prep
-%setup -q
-%patch0
+%setup -q -n imapfilter-%{version}
+%patch0 -p1
 
 %build
 # imapfilter does not have any autotools based ./configure - just a plain Makefile
@@ -35,12 +38,7 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc README LICENSE
 %{_bindir}/imapfilter
 %{_datadir}/imapfilter/
@@ -49,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul  2 2013 David Sommerseth <davids@redhat.com> - 2.5.5-1
+- Updated to upstream imapfilter-2.5.5
+- Updated download URL and generally cleaned up spec file
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index b2543c9..db473bf 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-93821a52b8906e789c63b639cbf86dac  imapfilter-2.5.tar.gz
+28769b186e27cbef2f7d85ecce8e3a13  imapfilter-makefile-fix-v2.5.5.patch
+719b7f606948699d5f057e3a62e6c666  imapfilter-2.5.5.tar.gz