diff --git a/texstudio.changes b/texstudio.changes
index 9e2550b..dcde1f8 100644
--- a/texstudio.changes
+++ b/texstudio.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan  3 13:37:25 UTC 2018 - stefan.bruens@rwth-aachen.de
+
+- Disable crash handler on aarch64/armv6l/armv7l, aarch64 is
+  not implemented and armv6l/armv7l is broken
+- use %qmake5 macro to supply CXXFLAGS and also CFLAGS
+
 -------------------------------------------------------------------
 Tue Aug 22 19:25:53 UTC 2017 - dmitry_r@opensuse.org
 
diff --git a/texstudio.spec b/texstudio.spec
index e9327bb..c68c2b7 100644
--- a/texstudio.spec
+++ b/texstudio.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package texstudio
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -53,13 +53,19 @@ syntax highlighting, automatically code completion and more.
 %setup -q -n %{name}%{version}
 
 %build
-%if 0%{?suse_version} <= 1320
-qmake QMAKE_CXXFLAGS="%optflags -fno-strict-aliasing" CONFIG-=debug texstudio.pro
-%else
-qmake-qt5 QMAKE_CXXFLAGS="%optflags -fno-strict-aliasing" CONFIG-=debug texstudio.pro
+%ifarch aarch64 %{arm}
+%define crashhandler NO_CRASH_HANDLER=true
 %endif
 
-make %{?_smp_mflags}
+%if 0%{?suse_version} <= 1320
+qmake QMAKE_CXXFLAGS="%optflags -fno-strict-aliasing" \
+      QMAKE_CFLAGS="%optflags -fno-strict-aliasing" \
+      CONFIG-=debug texstudio.pro
+%else
+%{qmake5} CONFIG-=debug %{?crashhandler} texstudio.pro
+%endif
+
+%{make_jobs}
 
 %install
 make INSTALL_ROOT=%{buildroot} install