diff --git a/depends/common/oberon/CMakeLists.txt b/depends/common/oberon/CMakeLists.txt
index ea43f6d..714fa08 100644
--- a/depends/common/oberon/CMakeLists.txt
+++ b/depends/common/oberon/CMakeLists.txt
@@ -7,6 +7,21 @@ include(ExternalProject)
 
 string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
+# Jenkins CI jobs can have this env var set
+# Use it if available
+if(DEFINED ENV{BUILDTHREADS})
+  set(build_job_count -j$ENV{BUILDTHREADS})
+  message(STATUS "Using $ENV{BUILDTHREADS} threads from ENV var BUILDTHREADS")
+else()
+  # Most likely a non CI build, so do a best attempt just using ProcessorCount
+  include(ProcessorCount)
+  ProcessorCount(cpu_count)
+  if(NOT cpu_count EQUAL 0)
+    set(build_job_count -j${cpu_count})
+    message(STATUS "Using ${cpu_count} threads deduced by ProcessorCount")
+  endif()
+endif()
+
 set(LIBRETRO_BINARY_DIR .)
 set(LIBRETRO_SONAME oberon_libretro${CMAKE_SHARED_LIBRARY_SUFFIX})
 set(LIBRETRO_JNISONAME libretro${CMAKE_SHARED_LIBRARY_SUFFIX})
@@ -23,9 +38,9 @@ if(CORE_SYSTEM_NAME STREQUAL windows)
     set(MSYSTEM MINGW32)
   endif()
   set(BUILD_COMMAND ${MINGW_MAKE}
-                    -j$ENV{NUMBER_OF_PROCESSORS}
                     -C .
                     -f Makefile.libretro
+                    ${build_job_count}
                     ${LIBRETRO_DEBUG}
                     GIT_VERSION=
                     MSYSTEM=${MSYSTEM}
@@ -35,6 +50,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL linux)
   set(BUILD_COMMAND $(MAKE)
                     -C .
                     -f Makefile.libretro
+                    ${build_job_count}
                     ${LIBRETRO_DEBUG}
                     GIT_VERSION=
                     platform=unix
@@ -48,6 +64,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL osx)
   set(BUILD_COMMAND $(MAKE)
                     -C .
                     -f Makefile.libretro
+                    ${build_job_count}
                     ${LIBRETRO_DEBUG}
                     arch=${ARCH}
                     CROSS_COMPILE=1
@@ -67,6 +84,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedde
     set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE)
                                                   -C .
                                                   -f Makefile.libretro
+                                                  ${build_job_count}
                                                   ${LIBRETRO_DEBUG}
                                                   GIT_VERSION=
                                                   platform=${PLATFORM}
@@ -76,6 +94,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedde
     set(BUILD_COMMAND IOSSDK=${CMAKE_OSX_SYSROOT} $(MAKE)
                                                   -C .
                                                   -f Makefile.libretro
+                                                  ${build_job_count}
                                                   ${LIBRETRO_DEBUG}
                                                   GIT_VERSION=
                                                   platform=tvos-arm64
@@ -94,6 +113,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL android)
   endif()
   set(BUILD_COMMAND GNUMAKE=$(MAKE) ${NDKROOT}/ndk-build
                                     -C Libretro/jni
+                                    ${build_job_count}
                                     ${LIBRETRO_DEBUG}
                                     APP_ABI=${PLATFORM}
                                     APP_SHORT_COMMANDS=true
@@ -103,13 +123,12 @@ elseif(CORE_SYSTEM_NAME STREQUAL android)
                                     V7NEONOPTIMIZATION=1
                                     
                     && cp ${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR}/${PLATFORM}/${LIBRETRO_JNISONAME} ${PROJECT_SOURCE_DIR}/${LIBRETRO_BINARY_DIR}/${LIBRETRO_SONAME})
-elseif(CORE_SYSTEM_NAME STREQUAL rbpi)
-  message(FATAL_ERROR "${PROJECT_NAME} needs RPi build command in CMakeLists.txt!")
 elseif(CORE_SYSTEM_NAME STREQUAL freebsd)
   set(BUILD_COMMAND $(MAKE)
                     -C .
                     -f Makefile.libretro
-                    ${LIBRETRO_DEBUG
+                    ${build_job_count}
+                    ${LIBRETRO_DEBUG}
                     GIT_VERSION=
                     platform=unix
                     )
diff --git a/depends/common/oberon/oberon.txt b/depends/common/oberon/oberon.txt
index 6bd510d..abf1c9f 100644
--- a/depends/common/oberon/oberon.txt
+++ b/depends/common/oberon/oberon.txt
@@ -1 +1 @@
-oberon https://github.com/libretro/oberon-risc-emu/archive/2ff6cfacf6f986b6595514ec11b919d4913c92f1.tar.gz
+oberon https://github.com/libretro/oberon-risc-emu/archive/532b44c31190640628fea388bb593cc247814612.tar.gz
diff --git a/game.libretro.oberon/addon.xml.in b/game.libretro.oberon/addon.xml.in
index 1c03e71..ed040a1 100644
--- a/game.libretro.oberon/addon.xml.in
+++ b/game.libretro.oberon/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="game.libretro.oberon"
 		name="Oberon RISC Emulator"
-		version="0.0.1.21"
+		version="0.0.1.22"
 		provider-name="Peter De Wachter, Emery Hemingway">
 	<requires>
 		<import addon="game.libretro" version="1.0.0"/>