diff --git a/ansible.spec b/ansible.spec
index 6700357..b862755 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -20,7 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Name: ansible
 Summary: SSH-based configuration management, deployment, and task execution system
 Version: 2.4.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Group: Development/Libraries
 License: GPLv3+
@@ -236,8 +236,15 @@ pushd %{py3dir}
 popd
 
 for i in $RPM_BUILD_ROOT/%{_bindir}/ansible* ; do
-    mv $i $i-%{python3_version}
-    ln -s %{_bindir}/$(basename $i)-%{python3_version} $i-3
+    if [ $(basename $i) = "ansible-connection" -o $(basename $i) = "ansible" ] ; then
+        mv $i $i-%{python3_version}
+        ln -s %{_bindir}/$(basename $i)-%{python3_version} $i-3
+    else
+        # The ansible commands are themselves symlinks to /usr/bin/ansible.
+        # Need to change them to point to the python3 version
+        ln -s %{_bindir}/ansible-3 $i-%{python3_version}
+        ln -s %{_bindir}/$(basename $i)-%{python3_version} $i-3
+    fi
 done
 %endif # with_python3
 
@@ -321,6 +328,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Oct 12 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 2.4.0.0-3
+- Fix Python3 subpackage to symlink to the python3 versions of the scripts
+  instead of the python2 version
+
 * Mon Sep 25 2017 Kevin Fenzi <kevin@scrye.com> - 2.4.0.0-2
 - Rebase rhel6 jinja2 patch.
 - Conditionalize jmespath to work around amazon linux issues. Fixes bug #1494640