diff --git a/.gitignore b/.gitignore
index ea960be..4e6dc30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,5 @@
 /ansible-unittests-2.0.1.0.tar.xz
 /ansible-unittests-2.0.2.0.tar.xz
 /ansible-2.0.2.0.tar.gz
+/ansible-unittests-2.1.0.0.tar.xz
+/ansible-2.1.0.0.tar.gz
diff --git a/ansible-2.0.2.0-control_path.patch b/ansible-2.0.2.0-control_path.patch
deleted file mode 100644
index 841be37..0000000
--- a/ansible-2.0.2.0-control_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur ansible-2.0.2.0.orig/examples/ansible.cfg ansible-2.0.2.0/examples/ansible.cfg
---- ansible-2.0.2.0.orig/examples/ansible.cfg	2016-04-19 15:55:21.000000000 -0600
-+++ ansible-2.0.2.0/examples/ansible.cfg	2016-04-19 17:33:07.274148584 -0600
-@@ -222,6 +222,7 @@
- # Example: 
- # control_path = %(directory)s/%%h-%%r
- #control_path = %(directory)s/ansible-ssh-%%h-%%p-%%r
-+control_path = %(directory)s/ansible-ssh-%%C
- 
- # Enabling pipelining reduces the number of SSH operations required to 
- # execute a module on the remote server. This can result in a significant 
diff --git a/ansible-2.1.0.0-control_path.patch b/ansible-2.1.0.0-control_path.patch
new file mode 100644
index 0000000..7183dd3
--- /dev/null
+++ b/ansible-2.1.0.0-control_path.patch
@@ -0,0 +1,11 @@
+diff -Nur ansible-2.1.0.0.orig/examples/ansible.cfg ansible-2.1.0.0/examples/ansible.cfg
+--- ansible-2.1.0.0.orig/examples/ansible.cfg	2016-05-25 07:00:55.000000000 -0600
++++ ansible-2.1.0.0/examples/ansible.cfg	2016-05-25 08:58:31.768143613 -0600
+@@ -286,6 +286,7 @@
+ # Example:
+ # control_path = %(directory)s/%%h-%%r
+ #control_path = %(directory)s/ansible-ssh-%%h-%%p-%%r
++control_path = %(directory)s/ansible-ssh-%%C
+ 
+ # Enabling pipelining reduces the number of SSH operations required to
+ # execute a module on the remote server. This can result in a significant
diff --git a/ansible.spec b/ansible.spec
index 94ab59e..f569b83 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -9,14 +9,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Name: ansible
 Summary: SSH-based configuration management, deployment, and task execution system
-Version: 2.0.2.0
+Version: 2.1.0.0
 Release: 1%{?dist}
 
 Group: Development/Libraries
 License: GPLv3+
 Source0: http://releases.ansible.com/ansible/%{name}-%{version}.tar.gz
 # To retrieve the unittests, run:
-#   ./get-unittests.sh 2.0.1.0 v2.0.1.0-1
+#   ./get-unittests.sh 2.1.0.0 v2.1.0.0-1
 # Replace the first parameter with the version you want in the tarball name
 # Replace the second parameter with the git tag or hash that you want to sync with
 Source1: ansible-unittests-%{version}.tar.xz
@@ -25,7 +25,7 @@ Source100: get-unittests.sh
 # Patch control_path in the example config file to use %C so that it is shorter.
 # Helps with paths that exceed the system length.
 # Upstream issue: https://github.com/ansible/ansible/issues/11536
-Patch0: ansible-2.0.2.0-control_path.patch
+Patch0: ansible-2.1.0.0-control_path.patch
 
 # Patch to utilize a newer jinja2 package on epel6
 # Non-upstreamable as it creates a dependency on a specific version of jinja.
@@ -164,6 +164,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man1/ansible*
 
 %changelog
+* Wed May 25 2016 Kevin Fenzi <kevin@scrye.com> - 2.1.0.0-1
+- Update to 2.1.0.0.
+- Fixes: 1334097 1337474 1332233 1336266
+
 * Tue Apr 19 2016 Kevin Fenzi <kevin@scrye.com> - 2.0.2.0-1
 - Update to 2.0.2.0. https://github.com/ansible/ansible/blob/stable-2.0/CHANGELOG.md
 - Fixes CVE-2016-3096
diff --git a/sources b/sources
index 8c583bc..cd49093 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4174e74a7e27cd097e71605541fa52bf  ansible-unittests-2.0.2.0.tar.xz
-e210c7d696fe2c084f78a07b8cbc2981  ansible-2.0.2.0.tar.gz
+e77e1431ffd801295135177b96b449cc  ansible-unittests-2.1.0.0.tar.xz
+9d8bd04d3f0032c1948c5b2bf0b3b048  ansible-2.1.0.0.tar.gz