diff --git a/.gitignore b/.gitignore
index b18635a..57558e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
 /ansible-unittests.tar.xz
 /ansible-2.0.0.2.tar.gz
 /ansible-2.0.1.0.tar.gz
+/ansible-unittests-2.0.1.0.tar.xz
diff --git a/ansible.spec b/ansible.spec
index 85391ae..8afb69d 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -10,20 +10,28 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Name: ansible
 Summary: SSH-based configuration management, deployment, and task execution system
 Version: 2.0.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group: Development/Libraries
 License: GPLv3+
 Source0: http://releases.ansible.com/ansible/%{name}-%{version}.tar.gz
-# Use get-unittests.sh tags/v2.0.0-0.6.rc1 to retrieve the unittests
-# (Replace the tags/ parameter with the tag or hash that you want to sync with)
-Source1: ansible-unittests.tar.xz
+# To retrieve the unittests, run:
+#   ./get-unittests.sh 2.0.1.0 v2.0.1.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
 Source100: get-unittests.sh
+
+# Patch control_path in the example config file to use %C so that it is shorter.
+# Helps with path's that exceed the system length.
+# Upstream issue: https://github.com/ansible/ansible/issues/11536
+Patch0: ansible-2.0.1.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.
 # This is desirable for us as we have packages for that version but not for
 # upstream as they don't know what their customers are running.
 Patch100: ansible-newer-jinja.patch
+
 Url: http://ansible.com
 BuildArch: noarch
 
@@ -149,6 +157,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man1/ansible*
 
 %changelog
+* Thu Feb 25 2016 Toshio Kuratomi <toshio@fedoraproject.org> - 2.0.1.0-2
+- Patch control_path to be not hit path length limitations (RH BZ #1311729)
+- Version the test tarball
+
 * Thu Feb 25 2016 Toshio Kuratomi <toshio@fedoraproject.org> - 2.0.1.0-1
 - Update to upstream bugfix for 2.0.x release series.
 
diff --git a/get-unittests.sh b/get-unittests.sh
index 891021d..88ffcdc 100755
--- a/get-unittests.sh
+++ b/get-unittests.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+VERSION="$1"
+TAG="$2"
+
 if test -d ansible-temp ; then
   pushd ansible-temp
   git checkout devel
@@ -10,8 +13,8 @@ else
 fi
 
 pushd ansible-temp
-if test -n "$1" ; then
-  git checkout "$1"
+if test -n "$TAG" ; then
+  git checkout "$TAG"
 fi
 popd
-tar -cJvf ansible-unittests.tar.xz -C ansible-temp/ test/units
+tar -cJvf "ansible-unittests-$VERSION.tar.xz" -C ansible-temp/ test/units
diff --git a/sources b/sources
index 5c61240..80edc93 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-27c98be43321a3c1fddd86bfc4aa7407  ansible-unittests.tar.xz
 84c576762bc1a8a345fe12ac338bd2d8  ansible-2.0.1.0.tar.gz
+c3b64014fd23b9c8d53e261faab89720  ansible-unittests-2.0.1.0.tar.xz