diff --git a/angelscript-meson.build b/angelscript-meson.build
index 36a2c60..10aff65 100644
--- a/angelscript-meson.build
+++ b/angelscript-meson.build
@@ -1,47 +1,55 @@
 project('angelscript', 'cpp')
 
+arch = run_command('uname', '-p')
+
+srcs = [
+  'source/as_atomic.cpp',
+  'source/as_builder.cpp',
+  'source/as_bytecode.cpp',
+  'source/as_callfunc.cpp',
+  'source/as_callfunc_arm.cpp',
+  'source/as_callfunc_mips.cpp',
+  'source/as_callfunc_ppc.cpp',
+  'source/as_callfunc_ppc_64.cpp',
+  'source/as_callfunc_sh4.cpp',
+  'source/as_callfunc_x86.cpp',
+  'source/as_callfunc_x64_gcc.cpp',
+  'source/as_callfunc_x64_mingw.cpp',
+  'source/as_compiler.cpp',
+  'source/as_context.cpp',
+  'source/as_configgroup.cpp',
+  'source/as_datatype.cpp',
+  'source/as_generic.cpp',
+  'source/as_gc.cpp',
+  'source/as_globalproperty.cpp',
+  'source/as_memory.cpp',
+  'source/as_module.cpp',
+  'source/as_objecttype.cpp',
+  'source/as_outputbuffer.cpp',
+  'source/as_parser.cpp',
+  'source/as_restore.cpp',
+  'source/as_scriptcode.cpp',
+  'source/as_scriptengine.cpp',
+  'source/as_scriptfunction.cpp',
+  'source/as_scriptnode.cpp',
+  'source/as_scriptobject.cpp',
+  'source/as_string.cpp',
+  'source/as_string_util.cpp',
+  'source/as_thread.cpp',
+  'source/as_tokenizer.cpp',
+  'source/as_typeinfo.cpp',
+  'source/as_variablescope.cpp',
+]
+
+if arch.stdout().strip() == 'armv7l'
+  srcs += ['source/as_callfunc_arm.cpp', 'source/as_callfunc_arm_gcc.S']
+endif
+
 shared_library(
   'angelscript',
-  sources : [
-    'source/as_atomic.cpp',
-    'source/as_builder.cpp',
-    'source/as_bytecode.cpp',
-    'source/as_callfunc.cpp',
-    'source/as_callfunc_arm.cpp',
-    'source/as_callfunc_mips.cpp',
-    'source/as_callfunc_ppc.cpp',
-    'source/as_callfunc_ppc_64.cpp',
-    'source/as_callfunc_sh4.cpp',
-    'source/as_callfunc_x86.cpp',
-    'source/as_callfunc_x64_gcc.cpp',
-    'source/as_callfunc_x64_mingw.cpp',
-    'source/as_compiler.cpp',
-    'source/as_context.cpp',
-    'source/as_configgroup.cpp',
-    'source/as_datatype.cpp',
-    'source/as_generic.cpp',
-    'source/as_gc.cpp',
-    'source/as_globalproperty.cpp',
-    'source/as_memory.cpp',
-    'source/as_module.cpp',
-    'source/as_objecttype.cpp',
-    'source/as_outputbuffer.cpp',
-    'source/as_parser.cpp',
-    'source/as_restore.cpp',
-    'source/as_scriptcode.cpp',
-    'source/as_scriptengine.cpp',
-    'source/as_scriptfunction.cpp',
-    'source/as_scriptnode.cpp',
-    'source/as_scriptobject.cpp',
-    'source/as_string.cpp',
-    'source/as_string_util.cpp',
-    'source/as_thread.cpp',
-    'source/as_tokenizer.cpp',
-    'source/as_typeinfo.cpp',
-    'source/as_variablescope.cpp',
-  ],
+  sources : srcs,
   install : true,
-  soversion : '2.30',
+  soversion : '0',
   version : '2.30.0',
 )
 install_headers('include/angelscript.h')
diff --git a/angelscript.spec b/angelscript.spec
index b8057fd..d8057d8 100644
--- a/angelscript.spec
+++ b/angelscript.spec
@@ -1,6 +1,6 @@
 Name:           angelscript
 Version:        2.30.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Flexible cross-platform scripting library
 
 License:        zlib
@@ -57,6 +57,9 @@ chrpath -d %{buildroot}%{_libdir}/*
 %{_includedir}/%{name}.h
 
 %changelog
+* Wed May 20 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 2.30.0-4
+- Fix arm building
+
 * Mon May 18 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 2.30.0-3
 - Fix docs in devel subpkg