diff --git a/.gitignore b/.gitignore
index 63d919e..38d5b08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ rabbitmq-server-1.8.0.tar.gz
 /rabbitmq-server-3.5.3.tar.gz
 /rabbitmq-server-3.5.4.rc1.tar.gz
 /rabbitmq-server-3.5.4.rc2.tar.gz
+/rabbitmq-server-3.5.4.tar.gz
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index 52ce78f..be44e3d 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -3,10 +3,10 @@
 
 Name: rabbitmq-server
 Version: 3.5.4
-Release: 0.1.rc2%{?dist}
+Release: 1%{?dist}
 License: MPLv1.1
 Group: Development/Libraries
-Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.rc2.tar.gz
+Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
 Source1: rabbitmq-server.init
 Source2: rabbitmq-script-wrapper
 Source3: rabbitmq-server.logrotate
@@ -70,7 +70,7 @@ scalable implementation of an AMQP broker.
 %global _maindir %{buildroot}%{_rabbit_erllibdir}
 
 %prep
-%setup -q -n %{name}-%{version}.rc2
+%setup -q
 %patch0 -p1
 
 %build
@@ -204,6 +204,9 @@ done
 rm -rf %{buildroot}
 
 %changelog
+* Wed Jul 22 2015 John Eckersberg <eck@redhat.com> - 3.5.4-1
+- New upstream release - 3.5.4
+
 * Mon Jul 20 2015 John Eckersberg <eck@redhat.com> - 3.5.4-0.1.rc2
 - New upstream release candidate 3.5.4 RC2
 
diff --git a/sources b/sources
index 762aac2..177e314 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee997d17f62efe8cf7301a7268c668da  rabbitmq-server-3.5.4.rc2.tar.gz
+63c9cb6309b0f56b5d62fb74fb63c4f6  rabbitmq-server-3.5.4.tar.gz