diff --git a/.gitignore b/.gitignore
index 80b3171..af7d70b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /ClusterLabs-pacemaker-Pacemaker-1.1.7.tar.gz
 /ClusterLabs-pacemaker-b5b0a7b.tar.gz
 /ClusterLabs-pacemaker-c72d970.tar.gz
+/ClusterLabs-pacemaker-394e906.tar.gz
diff --git a/pacemaker.spec b/pacemaker.spec
index 7051f4f..a515285 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -3,7 +3,7 @@
 %global pcmk_docdir %{_docdir}/%{name}
 
 %global specversion 1
-%global upstream_version c72d970
+%global upstream_version 394e906
 %global upstream_prefix ClusterLabs-pacemaker
 
 # Compatibility macros for distros (fedora) that don't provide Python macros by default
@@ -527,6 +527,37 @@ exit 0
 
 %changelog
 
+* Fri Sep 21 2012 Andrew Beekhof <andrew@beekhof.net> 1.1.8-1
+- Rebuild for upstream 1.1.8 release
+
+- New upstream tarball: 394e906
+  Changesets: 269
+  Diff:       218 files changed, 16188 insertions(+), 5106 deletions(-)
+
+- See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details
+
+  + High: Core: Bug cl#5032 - Rewrite the iso8601 date handling code 
+  + High: corosync: Use unsigned nodeid's in the cib 
+  + High: crmd: Correctly handle scheduled node down events 
+  + High: fencing: Bug cl#5092 - Always timeout stonith operations if timeout period expires. 
+  + High: fencing: Bug cl#5093 - Stonith per device timeout option 
+  + High: fencing: Bug rhbz#801355 - Abort transition on DC when external fencing operation is detected 
+  + High: fencing: Bug rhbz#801355 - Merge fence requests for identical operations already in progress. 
+  + High: fencing: Bug rhbz#801355 - Report fencing operations external of pacemaker to cib 
+  + High: Fencing: fence_legacy - Fix passing of parameters containing '=' 
+  + High: fencing: Guarantee non-blocking when fetching stonith metadata 
+  + High: fencing: Return cached dynamic target list for busy devices. 
+  + High: lrmd: Cancel of recurring ops is now implied by rsc stop action. 
+  + High: lrmd: Bug cl#5090 - Do not block stonith monitor actions 
+  + High: lrmd: Bug cl#5092 - Fixes timeout value used when monitoring stonith resources 
+  + High: lrmd: Bug cl#5094 - Immediately report monitor errors for all stonith devices when lrmd's stonith connection fails. 
+  + High: PE: Bug cl#5044 - migrate_to no longer requires load_stopped due to transition loops 
+  + High: PE: Correctly find action definitions for anonymous clones 
+  + High: PE: Correctly find failcounts for /stopped/ anonymous clones 
+  + High: PE: Fix memory leaks found by valgrind 
+  + High: PE: Fix failcount expiration 
+
+
 * Wed Aug 8 2012 Andrew Beekhof <andrew@beekhof.net> 1.1.8-0.1-c72d970.git
 - Pre-release 1.1.8 build
   + New IPC implementation from libqb
diff --git a/sources b/sources
index 93d4f46..e509104 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35e7445bf74a99833da6d544eeef08cd  ClusterLabs-pacemaker-c72d970.tar.gz
+4603b6be6ef693081796a9b42791df3e  ClusterLabs-pacemaker-394e906.tar.gz