diff --git a/uhd.spec b/uhd.spec
index f7cd309..ff42ec6 100644
--- a/uhd.spec
+++ b/uhd.spec
@@ -16,8 +16,8 @@
 
 %global wireshark_ver %((%{__awk} '/^#define VERSION[ \t]+/ { print $NF }' /usr/include/wireshark/config.h 2>/dev/null||echo none)|/usr/bin/tr -d '"')
 
-%ifarch %{arm}
-%if %{without neon}
+%ifarch %{arm} aarch64
+%if ! %{with neon}
 %global have_neon -DHAVE_ARM_NEON_H=0
 %endif
 %endif
@@ -25,7 +25,7 @@
 Name:           uhd
 URL:            http://code.ettus.com/redmine/ettus/projects/uhd/wiki
 Version:        %{ver_major}.%{ver_minor}.%{ver_patch}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv3+
 BuildRequires:  cmake
 BuildRequires:  boost-devel, libusb1-devel, python-cheetah, ncurses-devel
@@ -212,6 +212,10 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log
 %{_bindir}/chdr_log
 
 %changelog
+* Wed Mar 11 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.8.2-2
+- Fixed building without NEON, especially on aarch64
+  Resolves: rhbz#1200836
+
 * Fri Mar  6 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.8.2-1
 - New version
 - Dropped uhd-dump-libs and wireshark-1.12-fix patches (both upstreamed)