diff --git a/condor.spec b/condor.spec
index 2946020..261b8c3 100644
--- a/condor.spec
+++ b/condor.spec
@@ -16,7 +16,7 @@
 #######################
 Name:           condor
 Version:        8.3.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 #Release:        1.%{shortcommit}%{?dist}
 Summary:        Condor: High Throughput Computing
 License:        ASL 2.0
@@ -43,6 +43,8 @@ Patch4:         condor_aviary_schedulerobject.patch
 Patch5:         condor_aviary_sock_assign.patch
 # Backport an upstream fix for an interface change in globus-gsi-credential
 Patch6:         https://github.com/htcondor/htcondor/commit/d10e85eada71599caebb56fde50dd42bbbf6b65d.patch
+# fix ftbfs on aarch64 - rhbz#1259666
+Patch7:         fix-aarch64.patch
 
 #######################
 BuildRequires: cmake
@@ -330,6 +332,7 @@ exit 0
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 cp %{SOURCE1} %{name}-tmpfiles.conf
 cp %{SOURCE2} %{name}.service
 cp %{SOURCE3} .
@@ -994,6 +997,9 @@ echo "*********** Verify NMI status is all GREEN ***********"
 /sbin/ldconfig
 
 %changelog
+* Thu Sep 03 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 8.3.6-4
+- fix typedef conflict resulting in ftbfs on aarch64 - rhbz#1259666
+
 * Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 8.3.6-3
 - Rebuilt for Boost 1.59
 
diff --git a/fix-aarch64.patch b/fix-aarch64.patch
new file mode 100644
index 0000000..eb1d28c
--- /dev/null
+++ b/fix-aarch64.patch
@@ -0,0 +1,22 @@
+Index: htcondor-8_3_6/src/condor_utils/read_user_log.h
+===================================================================
+--- htcondor-8_3_6.orig/src/condor_utils/read_user_log.h
++++ htcondor-8_3_6/src/condor_utils/read_user_log.h
+@@ -21,6 +21,8 @@
+ #ifndef _CONDOR_READ_USER_LOG_CPP_H
+ #define _CONDOR_READ_USER_LOG_CPP_H
+ 
++#include <stdint.h>
++
+ #if defined(__cplusplus)
+ 
+ // need this for int64_t, this includes sys/types
+@@ -33,7 +35,7 @@
+ # elif defined(__x86_64__) && ! defined(Darwin)
+    typedef long int64_t;
+    typedef unsigned long uint64_t;
+-# else
++# elif !defined(_STDINT_H)
+    typedef long long int64_t;
+    typedef unsigned long long uint64_t;
+ # endif