diff --git a/cfengine.changes b/cfengine.changes
index 7de2563..3ae00da 100644
--- a/cfengine.changes
+++ b/cfengine.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jun 18 13:36:37 UTC 2014 - kkaempf@suse.com
+
+- Upgrade to 3.6.0 final
+  Bugfixes 
+
+- remove drop-revision.patch, included upstream
+
 -------------------------------------------------------------------
 Fri May 30 07:49:13 UTC 2014 - kkaempf@suse.com
 
diff --git a/cfengine.spec b/cfengine.spec
index 9b3733a..2f88cb7 100644
--- a/cfengine.spec
+++ b/cfengine.spec
@@ -17,7 +17,7 @@
 
 
 Name:           cfengine
-%define         srcname core-3.6rc2-build1
+%define         srcname core-3.6.0
 %define         libname   libpromises
 %define         libsoname %{libname}3
 
@@ -32,7 +32,7 @@ Name:           cfengine
 Summary:        CFEngine automates large-scale IT computing infrastructure
 License:        GPL-3.0
 Group:          Productivity/Networking/System
-Version:        3.6.0rc2
+Version:        3.6.0
 Release:        0
 Url:            http://www.cfengine.org/
 Source:         %{srcname}.tar.gz
@@ -66,10 +66,6 @@ Source107:      http://www.verticalsysadmin.com/cfengine/primer.pdf
 # SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de
 Patch2:         remove-am_subst_notmake.patch
 
-# drop revision from configure.ac, autotools will evaluate it as 'unkwown'
-# kkaempf@suse.de
-Patch3:         drop-revision.patch
-
 # PATCH-FIX-UPSTREAM add 'suse' class for consistency with other vendor classes
 # PATCH-FEATURE-UPSTREAM better /etc/SuSE-release parsing, upstream #5423
 # kkaempf@suse.de
@@ -190,7 +186,6 @@ Lots of examples promises for CFEngine.
 %if 0%{?rhel_version} >= 500 && 0%{?rhel_version} < 600 
 %patch2 -p1
 %endif
-%patch3 -p1
 %patch5 -p1
 %patch6 -p1
 
diff --git a/core-3.6.0.tar.gz b/core-3.6.0.tar.gz
new file mode 100644
index 0000000..8bc9125
--- /dev/null
+++ b/core-3.6.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fbaf83b14e34b8ceacd49df89bde070c6f5d8e9bd007c9058542617b5cf91b27
+size 1434622
diff --git a/core-3.6rc2-build1.tar.gz b/core-3.6rc2-build1.tar.gz
deleted file mode 100644
index df12939..0000000
--- a/core-3.6rc2-build1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a62b4e44247041e72ea2c112b3ab3ae51fd53fab5d46a40f164e16ecfbc2bbf2
-size 1433024
diff --git a/drop-revision.patch b/drop-revision.patch
deleted file mode 100644
index 8c2a682..0000000
--- a/drop-revision.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-core-3.6rc/configure.ac ./configure.ac
---- ../orig-core-3.6rc/configure.ac	2014-04-10 14:27:57.000000000 +0200
-+++ ./configure.ac	2014-04-11 09:30:17.105777237 +0200
-@@ -25,7 +25,7 @@
- dnl
- 
- _AM_SET_OPTION([tar-ustar])
--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")