diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec
index 51be970..eb1f765 100644
--- a/epel-rpm-macros.spec
+++ b/epel-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           epel-rpm-macros
 Version:        6
-Release:        9
+Release:        10
 Summary:        Extra Packages for Enterprise Linux RPM macros
 
 Group:          System Environment/Base
@@ -13,8 +13,7 @@ URL:            http://download.fedoraproject.org/pub/epel
 
 # Please see the file itself for an explanation of its odd name.
 Source0:        macros.zzz-epel
-Source1:        macros.zzz-epel-autosetup
-Source2:        macros.zzz-epel-python
+Source1:        macros.zzz-epel-python
 
 Source9:        GPL
 
@@ -34,8 +33,6 @@ install -pm 644 %{SOURCE9} .
 install -Dpm 644 %{SOURCE0} \
     %{buildroot}/etc/rpm/macros.zzz-epel
 install -Dpm 644 %{SOURCE1} \
-    %{buildroot}/etc/rpm/macros.zzz-epel-autosetup
-install -Dpm 644 %{SOURCE2} \
     %{buildroot}/etc/rpm/macros.zzz-epel-python
 
 %files
@@ -43,10 +40,12 @@ install -Dpm 644 %{SOURCE2} \
 # package being installed.
 %doc GPL
 /etc/rpm/macros.zzz-epel
-/etc/rpm/macros.zzz-epel-autosetup
 /etc/rpm/macros.zzz-epel-python
 
 %changelog
+* Wed May 11 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 6-10
+- Remove autosetup macros since they're now in RHEL 6.8.
+
 * Thu Apr 21 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 6-9
 - Add the %make_build macro.
 
diff --git a/macros.zzz-epel-autosetup b/macros.zzz-epel-autosetup
deleted file mode 100644
index 33d65e4..0000000
--- a/macros.zzz-epel-autosetup
+++ /dev/null
@@ -1,94 +0,0 @@
-# EPEL6-specific macros - autosetup
-#
-# Define some SCM locations which are not defined by default on EL6
-%__bzr /usr/bin/bzr
-%__git /usr/bin/git
-%__hg /usr/bin/hg
-%__quilt /usr/bin/quilt
-
-# These were copied verbatim from the Fedora 23 rpm macros on 2016-02-17.
-
-%patches %{lua: for i, p in ipairs(patches) do print(p.." ") end}
-%sources %{lua: for i, s in ipairs(sources) do print(s.." ") end}
-
-# Macros for further automated spec %setup and patch application
-# default to plain patch
-%__scm patch
-# meh, figure something saner
-%__scm_username rpm-build
-%__scm_usermail <rpm-build>
-%__scm_author %{__scm_username} %{__scm_usermail}
-
-# Plain patch (-m is unused)
-%__scm_setup_patch(q) %{nil}
-%__scm_apply_patch(qp:m:)\
-%{__patch} %{-p:-p%{-p*}} %{-q:-s}
-
-# Mercurial (aka hg)
-%__scm_setup_hg(q)\
-%{__hg} init %{-q} .\
-%{__hg} add %{-q} .\
-%{__hg} commit %{-q} --user "%{__scm_author}" -m "%{name}-%{version} base"
-
-%__scm_apply_hg(qp:m:)\
-%{__hg} import - %{-p:-p%{-p*}} %{-q} -m %{-m*} --user "%{__scm_author}"
-
-# Git
-%__scm_setup_git(q)\
-%{__git} init %{-q}\
-%{__git} config user.name "%{__scm_username}"\
-%{__git} config user.email "%{__scm_usermail}"\
-%{__git} add .\
-%{__git} commit %{-q} -a\\\
-	--author "%{__scm_author}" -m "%{name}-%{version} base"
-
-%__scm_apply_git(qp:m:)\
-%{__git} apply --index %{-p:-p%{-p*}} -\
-%{__git} commit %{-q} -m %{-m*} --author "%{__scm_author}"
-
-# Git, using "git am" (-m is unused)
-%__scm_setup_git_am(q)\
-%{expand:%__scm_setup_git %{-q}}
-
-%__scm_apply_git_am(qp:m:)\
-%{__git} am %{-q} %{-p:-p%{-p*}}
-
-# Quilt
-%__scm_setup_quilt(q) %{nil}
-%__scm_apply_quilt(qp:m:)\
-%{__quilt} import %{-p:-p%{-p*}} %{1} && %{__quilt} push
-
-# Bzr
-%__scm_setup_bzr(q)\
-%{__bzr} init %{-q}\
-%{__bzr} whoami --branch "%{__scm_author}"\
-%{__bzr} add .\
-%{__bzr} commit %{-q} -m "%{name}-%{version} base"
-
-# bzr doesn't seem to have its own command to apply patches?
-%__scm_apply_bzr(qp:m:)\
-%{__patch} %{-p:-p%{-p*}} %{-q:-s}\
-%{__bzr} commit %{-q} -m %{-m*}
-
-# Single patch application
-%apply_patch(qp:m:)\
-%{uncompress:%{1}} | %{expand:%__scm_apply_%{__scm} %{-q} %{-p:-p%{-p*}} %{-m:-m%{-m*}}}
-
-# Automatically apply all patches
-%autopatch(vp:)\
-%{lua:\
-local options = rpm.expand("%{!-v:-q} %{-p:-p%{-p*}} ")\
-for i, p in ipairs(patches) do\
-    print(rpm.expand("%apply_patch -m %{basename:"..p.."}  "..options..p.."\\n"))\
-end}
-
-# One macro to (optionally) do it all.
-# -S<scm name>	Sets the used patch application style, eg '-S git' enables
-#           	usage of git repository and per-patch commits.
-# -N		Disable automatic patch application
-# -p<num>	Use -p<num> for patch application
-%autosetup(a:b:cDn:TvNS:p:)\
-%setup %{-a} %{-b} %{-c} %{-D} %{-n} %{-T} %{!-v:-q}\
-%{-S:%global __scm %{-S*}}\
-%{-S:%{expand:%__scm_setup_%{-S*} %{!-v:-q}}}\
-%{!-N:%autopatch %{-v} %{-p:-p%{-p*}}}