diff --git a/condor.spec b/condor.spec
index e485bca..2b704c1 100644
--- a/condor.spec
+++ b/condor.spec
@@ -40,6 +40,7 @@ Patch2:         Werror_replace.patch
 Patch3:         condor_aviary_schedulerobject.patch
 Patch4:         condor_aviary_sock_assign.patch
 Patch5:		libdl.patch
+Patch6:		specify_python2.patch
 
 #######################
 BuildRequires: gcc gcc-c++
@@ -324,6 +325,7 @@ exit 0
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 cp %{SOURCE1} %{name}-tmpfiles.conf
 cp %{SOURCE2} %{name}.service
 cp %{SOURCE3} .
@@ -392,7 +394,7 @@ populate %{_datadir}/condor %{buildroot}/%{_usr}/lib/*
 # Except for the shared libs
 populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libclassad.s*
 populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libcondor_utils*.so
-populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libpyclassad2.7_%{srcver}.so
+#populate %{_libdir}/ %{buildroot}/%{_datadir}/condor/libpyclassad2.7_%{srcver}.so
 rm -f %{buildroot}/%{_datadir}/condor/libclassad.a
 
 # It is proper to put HTCondor specific libexec binaries under libexec/condor/
@@ -419,7 +421,7 @@ sed -e "s:^LIB\s*=.*:LIB = \$(RELEASE_DIR)/$LIB/condor:" \
 
 # Install the basic configuration, a Personal HTCondor config. Allows for
 # yum install condor + service condor start and go.
-mkdir -m0755 %{buildroot}/%{_sysconfdir}/condor/config.d
+#mkdir -m0755 %{buildroot}/%{_sysconfdir}/condor/config.d
 cp 00personal_condor.config %{buildroot}/%{_sysconfdir}/condor/config.d/00personal_condor.config
 
 %if 0%{?with_aviary}
@@ -452,14 +454,14 @@ mkdir -p -m1777 %{buildroot}/%{_var}/lib/condor/execute
 
 # no master shutdown program for now
 rm %{buildroot}/%{_sbindir}/condor_set_shutdown
-rm %{buildroot}/%{_mandir}/man1/condor_set_shutdown.1.gz
+rm %{buildroot}/%{_mandir}/man1/condor_set_shutdown.1
 
 # not packaging standard universe
-rm %{buildroot}/%{_mandir}/man1/condor_compile.1.gz
-rm %{buildroot}/%{_mandir}/man1/condor_checkpoint.1.gz
+rm %{buildroot}/%{_mandir}/man1/condor_compile.1
+rm %{buildroot}/%{_mandir}/man1/condor_checkpoint.1
 
 # not packaging configure/install scripts
-rm %{buildroot}/%{_mandir}/man1/condor_configure.1.gz
+rm %{buildroot}/%{_mandir}/man1/condor_configure.1
 
 # Remove junk
 rm -r %{buildroot}/%{_sysconfdir}/sysconfig
@@ -475,7 +477,7 @@ install -d -m 0710 %{buildroot}%{_localstatedir}/run/%{name}/
 mkdir -p %{buildroot}%{_unitdir}
 cp %{name}.service %{buildroot}%{_unitdir}/condor.service
 
-populate %{python_sitearch}/ %{buildroot}/%{_datadir}/condor/python/{classad,htcondor}.so
+#populate %{python_sitearch}/ %{buildroot}/%{_datadir}/condor/python/{classad,htcondor}.so
 
 # Remove stuff that comes from the full-deploy
 rm -rf %{buildroot}%{_sbindir}/cleanup_release
@@ -525,7 +527,7 @@ rm -rf %{buildroot}%{_includedir}/write_user_log.h
 rm -rf %{buildroot}%{_libexecdir}/condor/bgp_*
 rm -rf %{buildroot}%{_datadir}/condor/libchirp_client.*
 rm -rf %{buildroot}%{_datadir}/condor/libcondorapi.a
-rm -rf %{buildroot}%{_datadir}/condor/python/{htcondor,classad}.so
+#rm -rf %{buildroot}%{_datadir}/condor/python/{htcondor,classad}.so
 rm -rf %{buildroot}%{_datadir}/condor/{libpyclassad_*,htcondor,classad}.so
 rm %{buildroot}%{_libexecdir}/condor/condor_schedd.init
 rm -rf %{buildroot}%{_libexecdir}/condor/pandad
@@ -599,10 +601,11 @@ rm -rf %{buildroot}/etc/examples
 %_libexecdir/condor/interactive.sub
 %_libexecdir/condor/linux_kernel_tuning
 %_libexecdir/condor/condor_dagman_metrics_reporter
-%_libexecdir/condor/condor_history_helper
+#%_libexecdir/condor/condor_history_helper
 %_libexecdir/condor/condor_pid_ns_init
 %_libexecdir/condor/condor_urlfetch
 %_mandir/man1/condor_advertise.1.gz
+%_mandir/man1/condor_annex.1.gz
 %_mandir/man1/condor_check_userlogs.1.gz
 %_mandir/man1/condor_chirp.1.gz
 %_mandir/man1/condor_convert_history.1*
@@ -665,7 +668,7 @@ rm -rf %{buildroot}/etc/examples
 # bin/condor is a link for checkpoint, reschedule, vacate
 %_libdir/libcondor_utils*.so
 %_libexecdir/condor/panda-plugin.so
-%_libexecdir/condor/libcollector_python_plugin.so
+#%_libexecdir/condor/libcollector_python_plugin.so
 %_bindir/condor_submit_dag
 %_bindir/condor_who
 %_bindir/condor_prio
@@ -691,7 +694,7 @@ rm -rf %{buildroot}/etc/examples
 %_bindir/condor_vacate_job
 %_bindir/condor_findhost
 %_bindir/condor_stats
-%_bindir/condor_top.pl
+#%_bindir/condor_top.pl
 %_bindir/condor_transform_ads
 %_bindir/condor_version
 %_bindir/condor_history
@@ -720,7 +723,7 @@ rm -rf %{buildroot}/etc/examples
 %_sbindir/condor_convert_history
 %_sbindir/condor_fetchlog
 %_sbindir/condor_had
-%_sbindir/condor_init
+#%_sbindir/condor_init
 %_sbindir/condor_master
 %_sbindir/condor_negotiator
 %_sbindir/condor_off
@@ -729,7 +732,7 @@ rm -rf %{buildroot}/etc/examples
 %_sbindir/condor_reconfig
 %_sbindir/condor_replication
 %_sbindir/condor_restart
-%attr(6755, root, root) %_sbindir/condor_root_switchboard
+#%attr(6755, root, root) %_sbindir/condor_root_switchboard
 %_sbindir/condor_schedd
 %_sbindir/condor_shadow
 %_sbindir/condor_startd
@@ -945,9 +948,9 @@ rm -rf %{buildroot}/etc/examples
 
 #################
 %files -n python2-condor
-%{python2_sitearch}/classad.so
-%{python2_sitearch}/htcondor.so
-%{_libdir}/libpyclassad2.7_%{srcver}.so
+#%{python2_sitearch}/classad.so
+#%{python2_sitearch}/htcondor.so
+#%{_libdir}/libpyclassad2.7_%{srcver}.so
 
 #################
 %if 0%{?with_bosco}