diff --git a/cfengine.changes b/cfengine.changes
index f5318a6..7de2563 100644
--- a/cfengine.changes
+++ b/cfengine.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 30 07:49:13 UTC 2014 - kkaempf@suse.com
+
+- Upgrade to 3.6.0rc2
+  Bugfix release
+
 -------------------------------------------------------------------
 Fri May  2 11:52:01 UTC 2014 - kkaempf@suse.com
 
diff --git a/cfengine.spec b/cfengine.spec
index c3c5d28..9b3733a 100644
--- a/cfengine.spec
+++ b/cfengine.spec
@@ -17,7 +17,7 @@
 
 
 Name:           cfengine
-%define         srcname core
+%define         srcname core-3.6rc2-build1
 %define         libname   libpromises
 %define         libsoname %{libname}3
 
@@ -32,10 +32,10 @@ Name:           cfengine
 Summary:        CFEngine automates large-scale IT computing infrastructure
 License:        GPL-3.0
 Group:          Productivity/Networking/System
-Version:        3.6rc
+Version:        3.6.0rc2
 Release:        0
 Url:            http://www.cfengine.org/
-Source:         %{srcname}-%{version}.tar.gz
+Source:         %{srcname}.tar.gz
 Source1:        %{name}.SuSEfirewall2
 
 # wtf? SLE_11 does not honor rpmlintrc
@@ -183,7 +183,7 @@ Group:          Documentation/Other
 Lots of examples promises for CFEngine.
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q -n %{srcname}
 %if 0%{?suse_version} <= 1110
 %patch2 -p1
 %endif
diff --git a/core-3.6rc.tar.gz b/core-3.6rc.tar.gz
deleted file mode 100644
index 5f915b5..0000000
--- a/core-3.6rc.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2128b34f6cf4a3d8a3a7b8f2f31c8f7d818a15dc4445e44623e4ef0c961cbbdc
-size 1412258
diff --git a/core-3.6rc2-build1.tar.gz b/core-3.6rc2-build1.tar.gz
new file mode 100644
index 0000000..df12939
--- /dev/null
+++ b/core-3.6rc2-build1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a62b4e44247041e72ea2c112b3ab3ae51fd53fab5d46a40f164e16ecfbc2bbf2
+size 1433024
diff --git a/drop-revision.patch b/drop-revision.patch
index 77c3e35..8c2a682 100644
--- a/drop-revision.patch
+++ b/drop-revision.patch
@@ -5,8 +5,8 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
  dnl
  
  _AM_SET_OPTION([tar-ustar])
--AM_INIT_AUTOMAKE(cfengine, 3.6.0rc.revision)
-+AM_INIT_AUTOMAKE(cfengine, 3.6.0rc)
+-AM_INIT_AUTOMAKE(cfengine, 3.6.0.revision)
++AM_INIT_AUTOMAKE(cfengine, 3.6.0rc2)
  AM_MAINTAINER_MODE([enable])
  
  AC_DEFINE(BUILD_YEAR, esyscmd([date +%Y | tr -d '\n']), "Software build year")