diff --git a/.gitignore b/.gitignore
index 8062fd7..48ffa52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 vmpsd-1.4.01.tar.gz
+/vmpsd-1.4.02.tar.gz
+/vmpsd-1.4.03.tar.gz
+/vmpsd-1.4.04.tar.gz
diff --git a/sources b/sources
index 3f070fe..8d3133a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b95f6390f0a340f4f99d4e8f72201cb4  vmpsd-1.4.01.tar.gz
+27d8a178c3372b61e74898cec43856b8  vmpsd-1.4.04.tar.gz
diff --git a/vmpsd.spec b/vmpsd.spec
index 9fdce9a..cfc4b62 100644
--- a/vmpsd.spec
+++ b/vmpsd.spec
@@ -1,6 +1,6 @@
 Name:		vmpsd 
-Version:	1.4.01
-Release:	7%{?dist}
+Version:	1.4.04
+Release:	1%{?dist}
 Summary:	A GPL implementation of Cisco Systems' VMPS
 
 Group:	System Environment/Daemons
@@ -23,7 +23,7 @@ specific VLANs based on MAC address of connecting device. OpenVMPS is a GPL
 implementation of VMPS.
 
 %prep
-%setup -qn %{name}
+%setup -qn %{name}-%{version}
 
 %build
 %configure
@@ -72,6 +72,18 @@ fi
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Wed Apr 11 2012 Colin Coe <colin.coe@gmail.com> - 1.4.04-1
+- Rebase to latest upstream to resolve BZ754963
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.03-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon May 2 2011 Colin Coe <colin.coe@gmail.com> - 1.4.03-1
+- Rebase to latest upstream to resolve BZ699728
+
+* Thu Apr 28 2011 Colin Coe <colin.coe@gmail.com> - 1.4.02-1
+- Rebase to latest upstream
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.01-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild