diff --git a/texlive.changes b/texlive.changes
index d26497f..afbc2f1 100644
--- a/texlive.changes
+++ b/texlive.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb  2 08:11:37 UTC 2016 - werner@suse.de
+
+- Be aware that LuaJIT does not build on all architectures
+
 -------------------------------------------------------------------
 Thu Jan 28 10:52:36 UTC 2016 - werner@suse.de
 
diff --git a/texlive.spec b/texlive.spec
index 2a8c976..3eeaf2e 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -26,6 +26,16 @@
 %define __os_install_post	/usr/lib/rpm/brp-compress \\\
   %(ls /usr/lib/rpm/brp-suse.d/* 2> /dev/null | grep -vE 'symlink|desktop') %{nil}
 
+#
+# LuaJIT -- does not build nor support all architectures
+#	    Current status is available at https://github.com/LuaJIT/LuaJIT
+#	    Compare with libs/luajit/LuaJIT-<version>/src/lj_arch.h
+#
+%ifarch %ix86 x86_64 ppc arm mips
+%global         with_LuaJIT 1
+%endif
+%bcond_with	LuaJIT
+
 #
 # psutils -- is also available as the package psutils and therefore
 #	    not necessary required, enabling the resulting psutils
@@ -174,6 +184,7 @@ BuildRequires:  perl(LWP::Simple)
 BuildRequires:  perl(LWP::UserAgent)
 BuildRequires:  perl(List::AllUtils)
 BuildRequires:  perl(List::MoreUtils)
+BuildRequires:  perl(List::MoreUtils::XS)
 BuildRequires:  perl(Log::Log4perl)
 BuildRequires:  perl(Module::Build)
 %if 0%{suse_version} <= 1230
@@ -185,9 +196,9 @@ BuildRequires:  perl(Test::Differences)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod) >= 1.22
 BuildRequires:  perl(Test::Pod::Coverage) >= 1.08
-BuildRequires:  perl(Text::BibTeX) >= 0.62
+BuildRequires:  perl(Text::BibTeX) >= 0.70
 BuildRequires:  perl(Text::Roman)
-BuildRequires:  perl(Unicode::Collate) >= 0.89
+BuildRequires:  perl(Unicode::Collate) >= 1.12
 BuildRequires:  perl(Unicode::GCString)
 BuildRequires:  perl(Unicode::Normalize) >= 1.23
 BuildRequires:  perl(XML::LibXML::Simple)
@@ -2825,7 +2836,11 @@ popd
 	    --enable-seetexk			\
 	    --enable-tex4htk			\
 	    --enable-shared			\
+%if %{with LuaJIT}
 	    --enable-luajittex			\
+%else
+	    --disable-luajittex			\
+%endif
 	    --with-gnu-ld			\
 	    --with-gnu-libc			\
 	    --with-system-xz			\
@@ -2911,7 +2926,7 @@ popd
     install -m 0755 texk/seetexk/mydvichk ${prefix}/bin/
     install -m 0755 texk/seetexk/odd2even ${prefix}/bin/
 
-%ifarch %ix86 x86_64 ppc
+%if %{with LuaJIT}
     echo "Luaji is supported on this platform"
 %else
     for broken in luajittex texluajit texluajitc
@@ -3782,25 +3797,12 @@ rm -f /var/run/texlive/run-update
 %{_bindir}/texluac
 %{_bindir}/texluajit
 %{_bindir}/texluajitc
-%exclude %dir %{_includedir}/texlua52/
-%exclude %dir %{_includedir}/texluajit/
-%exclude %{_includedir}/texlua52/lauxlib.h
-%exclude %{_includedir}/texlua52/lua.h
-%exclude %{_includedir}/texlua52/lua.hpp
-%exclude %{_includedir}/texlua52/luaconf.h
-%exclude %{_includedir}/texlua52/lualib.h
-%exclude %{_includedir}/texluajit/lauxlib.h
-%exclude %{_includedir}/texluajit/lua.h
-%exclude %{_includedir}/texluajit/lua.hpp
-%exclude %{_includedir}/texluajit/luaconf.h
-%exclude %{_includedir}/texluajit/luajit.h
-%exclude %{_includedir}/texluajit/lualib.h
-%exclude %{_libdir}/libtexluajit.so
-%exclude %{_libdir}/libtexlua52.so
-%{_libdir}/libtexlua52.so.5
-%{_libdir}/libtexlua52.so.5.2.4
-%{_libdir}/libtexluajit.so.2
-%{_libdir}/libtexluajit.so.2.0.3
+%if %{with LuaJIT}
+%exclude %dir %{_includedir}/texlua*/
+%exclude %{_includedir}/texlua*/*.h*
+%exclude %{_libdir}/libtexlua*.so
+%{_libdir}/libtexlua*.so.*
+%endif
 
 %files m-tx-bin
 %defattr(-,root,root,755)