diff --git a/.gitignore b/.gitignore
index 8695546..390c116 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ _build
 /condor.spec
 /htcondor-8.5.0.tar.gz
 /htcondor-8.5.1.tar.gz
+/htcondor-8.5.2.tar.gz
diff --git a/condor.spec b/condor.spec
index 95b43b4..7e2c709 100644
--- a/condor.spec
+++ b/condor.spec
@@ -1,5 +1,5 @@
 %global newname         htcondor
-%global srcver		8_5_1
+%global srcver		8_5_2
 #global commit          a1a7df5888506c46cf7ce54ef8171336b7c71e72
 #global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
@@ -15,8 +15,8 @@
 
 #######################
 Name:           condor
-Version:        8.5.1
-Release:        4%{?dist}
+Version:        8.5.2
+Release:        1%{?dist}
 #Release:        1.%{shortcommit}%{?dist}
 Summary:        Condor: High Throughput Computing
 License:        ASL 2.0
@@ -230,6 +230,17 @@ The deltacloud_gahp enables HTCondor's ability to manage jobs run on
 resources exposed by the deltacloud API.
 
 #######################
+%package openstack-gahp
+Summary: HTCondor's OpenStack Gahp
+Group: Applications/System
+Requires: %name = %version-%release
+Requires: condor = %{version}-%{release}
+
+%description openstack-gahp
+The openstack_gahp enables HTCondor's ability to manage jobs run on
+resources exposed by the OpenStack API.
+
+#######################
 %package classads
 Summary: HTCondor's classified advertisement language
 Group: Development/Libraries
@@ -528,9 +539,6 @@ rm -rf %{buildroot}%{_datadir}/condor/libcondorapi.a
 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
-# I'm going to hold off on ganglia stuff for another rev or two
-rm -rf %{buildroot}/etc/condor/ganglia.d
-rm -rf %{buildroot}%{_libexecdir}/condor/condor_gangliad
 rm -rf %{buildroot}%{_libexecdir}/condor/pandad
 #rm -rf %{buildroot}%{_libexecdir}/condor/panda-plugin.so
 rm -rf %{buildroot}%{_libexecdir}/condor/libclassad_python_user.so
@@ -572,6 +580,8 @@ echo "*********** Verify NMI status is all GREEN ***********"
 %_datadir/condor/CondorJavaWrapper.class
 %_datadir/condor/scimark2lib.jar
 %dir %_sysconfdir/condor/config.d/
+%dir %_sysconfdir/condor/ganglia.d
+%_sysconfdir/condor/ganglia.d/00_default_metrics
 %config(noreplace) %_sysconfdir/condor/config.d/00personal_condor.config
 %_sysconfdir/condor/condor_ssh_to_job_sshd_config_template
 %dir %_libexecdir/condor/
@@ -579,6 +589,7 @@ echo "*********** Verify NMI status is all GREEN ***********"
 %_libexecdir/condor/condor_ssh
 %_libexecdir/condor/sshd.sh
 %_libexecdir/condor/condor_job_router
+%_libexecdir/condor/condor_gangliad
 %_libexecdir/condor/condor_glexec_setup
 %_libexecdir/condor/condor_glexec_run
 %_libexecdir/condor/condor_glexec_job_wrapper
@@ -889,6 +900,11 @@ echo "*********** Verify NMI status is all GREEN ***********"
 %_sbindir/deltacloud_gahp
 
 #################
+%files openstack-gahp
+%doc LICENSE-2.0.txt NOTICE.txt
+%_sbindir/openstack_gahp
+
+#################
 %files classads
 %doc LICENSE-2.0.txt NOTICE.txt
 %_libdir/libclassad.so.*
@@ -988,6 +1004,11 @@ echo "*********** Verify NMI status is all GREEN ***********"
 /sbin/ldconfig
 
 %changelog
+* Fri Feb 19 2016 Ben Cotton <bcotton@fedoraproject.org> - 8.5.2-1
+- Update to latest source 8.5.2
+- Enable HTCondor's Ganglia daemon
+- Add package for openstack_gahp
+
 * Wed Feb 17 2016 Ben Cotton <bcotton@fedoraproject.org> - 8.5.1-4
 - Remove aviary to fix FTBFS issues
 - Correct the location of the panda plugin
diff --git a/sources b/sources
index e57a890..388e3d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f468a0c909eba0c6d02491767f89d7ec  htcondor-8.5.1.tar.gz
+4c5e956209d78125d68bb23a08849c66  htcondor-8.5.2.tar.gz