diff --git a/build-config.sh b/build-config.sh
index bddb8660..65cb465f 100644
--- a/build-config.sh
+++ b/build-config.sh
@@ -58,6 +58,7 @@ include_core_puae
 include_core_bnes
 include_core_fceumm
 include_core_gambatte
+include_core_sameboy
 include_core_meteor
 include_core_nxengine
 include_core_prboom
diff --git a/dist/info/sameboy_libretro.info b/dist/info/sameboy_libretro.info
new file mode 100644
index 00000000..1cd3c089
--- /dev/null
+++ b/dist/info/sameboy_libretro.info
@@ -0,0 +1,12 @@
+display_name = "Game Boy / Game Boy Color (SameBoy)"
+authors = "LIJI32"
+supported_extensions = "gb|gbc"
+corename = "SameBoy"
+manufacturer = "Nintendo"
+categories = "Emulator"
+systemname = "Game Boy/Game Boy Color"
+database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
+license = "MIT"
+permissions = ""
+display_version = "v0.8.0"
+supports_no_game = "false"
diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh
index c094c90e..5927803e 100644
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@@ -263,6 +263,14 @@ libretro_gambatte_git_url="https://github.com/libretro/gambatte-libretro.git"
 libretro_gambatte_build_platform="$FORMAT_COMPILER_TARGET_ALT"
 libretro_gambatte_build_makefile="Makefile.libretro"
 
+include_core_sameboy() {
+	register_module core "sameboy"
+}
+libretro_sameboy_name="SameBoy"
+libretro_sameboy_git_url="https://github.com/libretro/SameBoy.git"
+libretro_sameboy_build_platform="$FORMAT_COMPILER_TARGET_ALT"
+libretro_sameboy_build_makefile="Makefile.libretro"
+
 include_core_meteor() {
 	register_module core "meteor" -ngc -ps3 -psp1 -qnx -wii
 }