diff --git a/.gitignore b/.gitignore
index 050c7b4..782aefc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ _build
 /htcondor-8.6.1.tar.gz
 /htcondor-8.6.2.tar.gz
 /htcondor-8.6.3.tar.gz
+/htcondor-8.6.4.tar.gz
diff --git a/condor.spec b/condor.spec
index fcc478b..a1e2ed8 100644
--- a/condor.spec
+++ b/condor.spec
@@ -1,5 +1,5 @@
 %global newname         htcondor
-%global srcver          8_6_3
+%global srcver          8_6_4
 
 %ifarch %{arm} %{ix86} x86_64
 %global with_mongodb    1
@@ -19,7 +19,7 @@
 
 #######################
 Name:           condor
-Version:        8.6.3
+Version:        8.6.4
 Release:        1%{?dist}
 Summary:        Condor: High Throughput Computing
 License:        ASL 2.0
@@ -609,6 +609,7 @@ rm -rf %{buildroot}/etc/examples
 %_mandir/man1/condor_advertise.1.gz
 %_mandir/man1/condor_check_userlogs.1.gz
 %_mandir/man1/condor_chirp.1.gz
+%_mandir/man1/condor_convert_history.1*
 %_mandir/man1/condor_cod.1.gz
 %_mandir/man1/condor_config_val.1.gz
 %_mandir/man1/condor_dagman.1.gz
@@ -720,6 +721,7 @@ rm -rf %{buildroot}/etc/examples
 %_sbindir/condor_c-gahp
 %_sbindir/condor_c-gahp_worker_thread
 %_sbindir/condor_collector
+%_sbindir/condor_convert_history
 %_sbindir/condor_fetchlog
 %_sbindir/condor_had
 %_sbindir/condor_init
@@ -996,6 +998,9 @@ rm -rf %{buildroot}/etc/examples
 /sbin/ldconfig
 
 %changelog
+* Fri Jul 07 2017 Ben Cotton <bcotton@fedoraproject.org> - 8.6.4-1
+- Update to latest upstream 8.6.4
+
 * Wed May 17 2017 Tim Theisen <ttheisen@fedoraproject.org> - 8.6.3-1
 - Update to latest upstream 8.6.3
 
diff --git a/sources b/sources
index 7553f73..3ccacd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (htcondor-8.6.3.tar.gz) = 512d5b5acd7f19f0ffe00a2552f369ad04a3a90990649f1a7a73d3294962225dbe7df656a870de8d5c8aaf84004d1feec556da3cc3146f638bc2dd8084d05b9d
+SHA512 (htcondor-8.6.4.tar.gz) = 72a8cc5029b8c1b99a04cf6e94122dcd63c06e7f1d5cceac126642dc966d963763d121237be3bb432b1d2a502c246550a2a893201581891375f3f95ee47877a0