diff --git a/build-config.sh b/build-config.sh
index 93005ab5..9a5da910 100644
--- a/build-config.sh
+++ b/build-config.sh
@@ -219,6 +219,7 @@ include_core_crocods
 include_core_cap32
 include_core_mu
 include_core_minivmac
+include_core_oberon_risc
 
 # -------------------------------------------------------------------------------------------------
 # Devkits
diff --git a/dist/info/oberon_libretro.info b/dist/info/oberon_libretro.info
new file mode 100644
index 00000000..2a269ec4
--- /dev/null
+++ b/dist/info/oberon_libretro.info
@@ -0,0 +1,7 @@
+display_name = "Oberon RISC Emulator"
+authors = "Peter De Wachter|Emery Hemingway"
+supported_extensions = "dsk"
+corename = "Oberon"
+categories = "Emulator"
+systemname = "Oberon RISC machine"
+supports_no_game = "false"
diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh
index 8f42324d..f5745245 100644
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@@ -186,6 +186,13 @@ libretro_minivmac_name="Mini Vmac"
 libretro_minivmac_git_url="https://github.com/libretro/libretro-minivmac.git"
 libretro_minivmac_build_makefile="Makefile"
 
+include_core_oberon() {
+	register_module core "oberon"
+}
+libretro_oberon_name="Oberon RISC Emulator"
+libretro_oberon_git_url="https://github.com/pdewacht/oberon-risc-emu"
+libretro_oberon_build_makefile="Makefile.libretro"
+
 include_core_reminiscence() {
 	register_module core "reminiscence"
 }