diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index b47b6d0..4ecce89 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -2,11 +2,11 @@
 
 
 Name: rabbitmq-server
-Version: 3.5.4.rc1
-Release: 1%{?dist}
+Version: 3.5.4
+Release: 0.1.rc1%{?dist}
 License: MPLv1.1
 Group: Development/Libraries
-Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
+Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.rc1.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
+%setup -q -n %{name}-%{version}.rc1
 %patch0 -p1
 
 %build
@@ -204,6 +204,9 @@ done
 rm -rf %{buildroot}
 
 %changelog
+* Wed Jul 15 2015 John Eckersberg <eck@redhat.com> - 3.5.4-0.1.rc1
+- Fix incorrect NVR for pre-release package
+
 * Tue Jul 14 2015 John Eckersberg <eck@redhat.com> - 3.5.4.rc1-1
 - New upstream release candidate 3.5.4 RC1