diff --git a/.cvsignore b/.cvsignore
index d985938..958cd29 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-resource-agents-3.0.11.tar.bz2
 a7c0f35916bf.tar.bz2
+resource-agents-3.0.12.tar.bz2
diff --git a/resource-agents.spec b/resource-agents.spec
index 1f08928..0649a51 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -21,7 +21,7 @@
 
 Name: resource-agents
 Summary: Open Source HA Resource Agents for Red Hat Cluster
-Version: 3.0.11
+Version: 3.0.12
 Release: 1%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
@@ -189,7 +189,14 @@ rm -rf %{buildroot}
 /usr/lib/ocf/resource.d/heartbeat/ldirectord
 
 %changelog
-* Sat May 10 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.11-2
+* Mon May 10 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.0.12-1
+- new upstream release
+  Resolves: rhbz#585217, rhbz#586100, rhbz#581533, rhbz#582753
+  Resolves: rhbz#582754, rhbz#585083, rhbz#587079, rhbz#588890
+  Resolves: rhbz#588925, rhbz#583789, rhbz#589131, rhbz#588010
+  Resolves: rhbz#576871, rhbz#576871, rhbz#590000, rhbz#589823
+
+* Mon May 10 2010 Andrew Beekhof <andrew@beekhof.net> - 3.0.12-1
 - New pacemaker agents upstream release: a7c0f35916bf
   + High: pgsql: properly implement pghost parameter
   + High: RA: mysql: fix syntax error
diff --git a/sources b/sources
index 24dad6c..3583373 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f9309dd40707f33c301d0e1fd095ee2b  resource-agents-3.0.11.tar.bz2
 47b99d289954bd9e3da382c8919f9386  a7c0f35916bf.tar.bz2
+88c983731f8ed9f6fd02d20ec697ebc8  resource-agents-3.0.12.tar.bz2