diff --git a/.gitignore b/.gitignore
index ce998d8..c4f326e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /freeipa-2.1.4.tar.gz
 /freeipa-2.1.90.pre1.tar.gz
 /freeipa-2.1.90.rc1.tar.gz
+/freeipa-2.2.0.tar.gz
diff --git a/freeipa.spec b/freeipa.spec
index 0c95feb..741d2f8 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -11,19 +11,17 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 %global POLICYCOREUTILSVER 1.33.12-1
 %global gettext_domain ipa
-%global VERSION 2.1.90.rc1
 
 Name:           freeipa
-Version:        2.1.90
-Release:        0.2%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 Group:          System Environment/Base
 License:        GPLv3+
 URL:            http://www.freeipa.org/
-Source0:        http://www.freeipa.org/downloads/src/freeipa-%{VERSION}.tar.gz
-Patch10:        freeipa-2.1.90-shellescape.patch
-BuildRoot:      %{_tmppath}/%{name}-%{VERSION}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://www.freeipa.org/downloads/src/freeipa-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! %{ONLY_CLIENT}
 BuildRequires:  389-ds-base-devel >= 1.2.10.4
@@ -76,7 +74,7 @@ Requires: %{name}-python = %{version}-%{release}
 Requires: %{name}-client = %{version}-%{release}
 Requires: %{name}-admintools = %{version}-%{release}
 Requires: %{name}-server-selinux = %{version}-%{release}
-Requires(pre): 389-ds-base >= 1.2.10.4
+Requires(pre): 389-ds-base >= 1.2.10.4-2
 Requires: openldap-clients
 Requires: nss
 Requires: nss-tools
@@ -97,11 +95,12 @@ Requires: python-memcached
 Requires: systemd-units >= 36-3
 Requires(pre): systemd-units
 Requires(post): systemd-units
-Requires: selinux-policy >= 3.10.0-82
+Requires: selinux-policy >= 3.10.0-110
 Requires(post): selinux-policy-base
-Requires: slapi-nis >= 0.38
+Requires: slapi-nis >= 0.40
 Requires: pki-ca >= 9.0.18
 Requires: pki-silent >= 9.0.18
+Requires: pki-setup  >= 9.0.18
 # Only tomcat6 greater than this version provides proper systemd support
 Requires: tomcat6 >= 6.0.32-17
 Requires: dogtag-pki-common-theme
@@ -165,9 +164,11 @@ Requires: wget
 Requires: libcurl >= 7.21.7-2
 Requires: xmlrpc-c >= 1.27.4
 Requires: sssd >= 1.8.0
-Requires: certmonger >= 0.26
+Requires: certmonger >= 0.53
 Requires: nss-tools
 Requires: bind-utils
+Requires: oddjob-mkhomedir
+Requires: python-krbV
 
 Obsoletes: ipa-client >= 1.0
 
@@ -222,8 +223,7 @@ package.
 
 
 %prep
-%setup -n freeipa-%{VERSION} -q
-%patch10 -p1
+%setup -n freeipa-%{version} -q
 
 %build
 export CFLAGS="$CFLAGS %{optflags}"
@@ -441,6 +441,8 @@ fi
 %{_libexecdir}/freeipa-systemd-upgrade
 %dir %{python_sitelib}/ipaserver
 %{python_sitelib}/ipaserver/*
+%dir %{_libdir}/ipa/certmonger
+%attr(755,root,root) %{_libdir}/ipa/certmonger/*
 %dir %{_usr}/share/ipa
 %{_usr}/share/ipa/wsgi.py*
 %{_usr}/share/ipa/*.ldif
@@ -467,7 +469,8 @@ fi
 %{_usr}/share/ipa/ui/*.svg
 %{_usr}/share/ipa/ui/*.ttf
 %{_usr}/share/ipa/ui/*.woff
-%config(noreplace) %{_usr}/share/ipa/ui/extension.js
+%dir %{_usr}/share/ipa/ui/ext
+%config(noreplace) %{_usr}/share/ipa/ui/ext/extension.js
 %dir %{_usr}/share/ipa/ui/images
 %{_usr}/share/ipa/ui/images/*.png
 %{_usr}/share/ipa/ui/images/*.gif
@@ -574,6 +577,13 @@ fi
 %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt
 
 %changelog
+* Thu May  3 2012 Rob Crittenden <rcritten@redhat.com> - 2.2.0-1
+- Updated to upstream 2.2.0 GA
+- Update minimum n-v-r of certmonger to 0.53
+- Update minimum n-v-r of slapi-nis to 0.40
+- Add Requires in client to oddjob-mkhomedir and python-krbV
+- Update minimum selinux-policy to 3.10.0-110
+
 * Mon Mar 19 2012 Rob Crittenden <rcritten@redhat.com> - 2.1.90-0.2
 - Update to upstream 2.2.0 beta 1 (2.1.90.rc1)
 - Set minimum n-v-r for pki-ca and pki-silent to 9.0.18.
diff --git a/sources b/sources
index ba551e2..c9aae2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cca14e87c51ea081564dda7e15775d46  freeipa-2.1.90.rc1.tar.gz
+c4195a6af15ade58e6d3add054dd8004  freeipa-2.2.0.tar.gz