diff --git a/.cvsignore b/.cvsignore
index e8af77c..43f4f8e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-sssd-1.2.0.tar.gz
+sssd-1.2.1.tar.gz
diff --git a/0001-Fix-broken-build-against-older-versions-of-OpenLDAP.patch b/0001-Fix-broken-build-against-older-versions-of-OpenLDAP.patch
deleted file mode 100644
index 97013c8..0000000
--- a/0001-Fix-broken-build-against-older-versions-of-OpenLDAP.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ea17887efffe046bfc018d375b28562d5e5d425a Mon Sep 17 00:00:00 2001
-From: Stephen Gallagher <sgallagh@redhat.com>
-Date: Fri, 4 Jun 2010 11:11:07 -0400
-Subject: [PATCH] Fix broken build against older versions of OpenLDAP
-
-OpenLDAP < 2.4 used LDAP_OPT_ERROR_STRING. It was changed to
-LDAP_OPT_DIAGNOSTIC_MESSAGE in 2.4. This patch will allow the TLS
-error messages to be displayed on either version.
----
- src/providers/ldap/sdap.h                  |   10 ++++++++++
- src/providers/ldap/sdap_async_connection.c |    4 ++--
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h
-index 0fc95df84c01b810ed0c8c0d5ccc46c375141a5f..09312282bd07e72cabe06a00898d77f04e3e07c0 100644
---- a/src/providers/ldap/sdap.h
-+++ b/src/providers/ldap/sdap.h
-@@ -26,6 +26,16 @@
- #include <ldap.h>
- #include "util/sss_ldap.h"
- 
-+#ifdef LDAP_OPT_DIAGNOSTIC_MESSAGE
-+#define SDAP_DIAGNOSTIC_MESSAGE LDAP_OPT_DIAGNOSTIC_MESSAGE
-+#else
-+#ifdef LDAP_OPT_ERROR_STRING
-+#define SDAP_DIAGNOSTIC_MESSAGE LDAP_OPT_ERROR_STRING
-+#else
-+#error No extended diagnostic message available
-+#endif
-+#endif
-+
- struct sdap_msg {
-     struct sdap_msg *next;
-     LDAPMessage *msg;
-diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c
-index 98249ea69f7aa81e8ed092d4f80963bbb22d63c6..14a1a4b7d2989a1623159cb5ef3caa041d0d5d52 100644
---- a/src/providers/ldap/sdap_async_connection.c
-+++ b/src/providers/ldap/sdap_async_connection.c
-@@ -147,7 +147,7 @@ struct tevent_req *sdap_connect_send(TALLOC_CTX *memctx,
-     lret = ldap_start_tls(state->sh->ldap, NULL, NULL, &msgid);
-     if (lret != LDAP_SUCCESS) {
-         optret = ldap_get_option(state->sh->ldap,
--                                 LDAP_OPT_DIAGNOSTIC_MESSAGE,
-+                                 SDAP_DIAGNOSTIC_MESSAGE,
-                                  (void*)&errmsg);
-         if (optret == LDAP_SUCCESS) {
-             DEBUG(3, ("ldap_start_tls failed: [%s] [%s]\n",
-@@ -230,7 +230,7 @@ static void sdap_connect_done(struct sdap_op *op,
-     if (ret != LDAP_SUCCESS) {
- 
-         optret = ldap_get_option(state->sh->ldap,
--                                 LDAP_OPT_DIAGNOSTIC_MESSAGE,
-+                                 SDAP_DIAGNOSTIC_MESSAGE,
-                                  (void*)&tlserr);
-         if (optret == LDAP_SUCCESS) {
-             DEBUG(3, ("ldap_install_tls failed: [%s] [%s]\n",
--- 
-1.7.0.1
-
diff --git a/sources b/sources
index 32e9a78..bc0eef9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b14a5ed5d57085303b4732ef1ff41e5  sssd-1.2.0.tar.gz
+6be107f576a40f808053f7196e6b33c0  sssd-1.2.1.tar.gz
diff --git a/sssd.spec b/sssd.spec
index ed0b826..f21d4ea 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -4,10 +4,10 @@
 %endif
 
 Name: sssd
-Version: 1.2.0
+Version: 1.2.1
 #Never reset the Release, always increment it
 #Otherwise we can have issues if library versions do not change
-Release: 13%{?dist}
+Release: 16%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 License: GPLv3+
@@ -15,14 +15,13 @@ URL: http://fedorahosted.org/sssd/
 Source0: https://fedorahosted.org/released/sssd/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-%define dhash_version 0.4.0
-%define path_utils_version 0.2.0
-%define collection_version 0.4.0
-%define ini_config_version 0.5.0
-%define refarray_version 0.1.0
+%global dhash_version 0.4.0
+%global path_utils_version 0.2.0
+%global collection_version 0.4.0
+%global ini_config_version 0.5.0
+%global refarray_version 0.1.0
 
 ### Patches ###
-Patch0001: 0001-Fix-broken-build-against-older-versions-of-OpenLDAP.patch
 
 ### Dependencies ###
 
@@ -38,11 +37,11 @@ Requires(post): python
 Requires(preun):  initscripts chkconfig
 Requires(postun): /sbin/service
 
-%define servicename sssd
-%define sssdstatedir %{_localstatedir}/lib/sss
-%define dbpath %{sssdstatedir}/db
-%define pipepath %{sssdstatedir}/pipes
-%define pubconfpath %{sssdstatedir}/pubconf
+%global servicename sssd
+%global sssdstatedir %{_localstatedir}/lib/sss
+%global dbpath %{sssdstatedir}/db
+%global pipepath %{sssdstatedir}/pipes
+%global pubconfpath %{sssdstatedir}/pubconf
 
 ### Build Dependencies ###
 
@@ -455,6 +454,16 @@ fi
 %postun -n libref_array -p /sbin/ldconfig
 
 %changelog
+* Mon Jun 21 2010 Stephen Gallagher <sgallagh@redhat.com> - 1.2.1-16
+- New stable upstream version 1.2.1
+- Resolves: rhbz#595529 - spec file should eschew %%define in favor of
+-                         %%global
+- Resolves: rhbz#593644 - Empty list of simple_allow_users causes sssd service
+-                         to fail while restart.
+- Resolves: rhbz#599026 - Makefile typo causes SSSD not to use the kernel
+-                         keyring
+- Resolves: rhbz#599724 - sssd is broken on Rawhide
+
 * Sun Jun 06 2010 Stephen Gallagher <sgallagh@redhat.com> - 1.2.0-13
 - Retag to account for missing patch file.