diff --git a/build-config.sh b/build-config.sh
index 8df05a25..f9f4d099 100644
--- a/build-config.sh
+++ b/build-config.sh
@@ -63,6 +63,7 @@ include_core_melonds
 
 # --- Nintendo 3DS emulator cores ---
 include_core_citra
+include_core_citra_canary
 
 # --- Game Boy/Color emulator cores ---
 include_core_gambatte
diff --git a/dist/info/citra_canary_libretro.info b/dist/info/citra_canary_libretro.info
new file mode 100644
index 00000000..563fcb87
--- /dev/null
+++ b/dist/info/citra_canary_libretro.info
@@ -0,0 +1,12 @@
+display_name = "Nintendo - 3DS (Citra Canary/Experimental)"
+authors = "Citra Emulation Project"
+supported_extensions = "3ds|3dsx|elf|axf|cci|cxi|app"
+corename = "Citra Canary/Experimental"
+manufacturer = "Nintendo"
+categories = "Emulator"
+systemname = "Nintendo 3DS"
+database = "Nintendo - Nintendo 3DS"
+license = "GPLv2+"
+permissions = ""
+display_version = "Git"
+supports_no_game = "false"
diff --git a/dist/info/citra_libretro.info b/dist/info/citra_libretro.info
index 8745d3d4..600bddb0 100644
--- a/dist/info/citra_libretro.info
+++ b/dist/info/citra_libretro.info
@@ -9,4 +9,4 @@ database = "Nintendo - Nintendo 3DS"
 license = "GPLv2+"
 permissions = ""
 display_version = "Git"
-supports_no_game = "false"
\ No newline at end of file
+supports_no_game = "false"
diff --git a/recipes/apple/cores-osx-x64-generic b/recipes/apple/cores-osx-x64-generic
index c6096b45..19576931 100644
--- a/recipes/apple/cores-osx-x64-generic
+++ b/recipes/apple/cores-osx-x64-generic
@@ -7,6 +7,7 @@ bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-l
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master YES GENERIC Makefile . | bsnes_mercury_accuracy:profile=accuracy bsnes_mercury_balanced:profile=balanced bsnes_mercury_performance:profile=performance
 chailove libretro-chailove https://github.com/libretro/libretro-chailove.git master YES GENERIC Makefile .
 citra libretro-citra https://github.com/libretro/citra.git master YES CMAKE Makefile build -DENABLE_LIBRETRO=1 -DENABLE_SDL2=0 -DENABLE_QT=0 -DDISABLE_LIBPNG=1 -DENABLE_WEB_SERVICE=0 -DCMAKE_BUILD_TYPE="Release" --target citra_libretro
+citra_canary libretro-citra_canary https://github.com/libretro/citra.git canary YES CMAKE Makefile build -DENABLE_LIBRETRO=1 -DENABLE_SDL2=0 -DENABLE_QT=0 -DDISABLE_LIBPNG=1 -DENABLE_WEB_SERVICE=0 -DCMAKE_BUILD_TYPE="Release" --target citra_canary_libretro
 craft libretro-craft https://github.com/libretro/craft master YES GENERIC Makefile.libretro .
 crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile .
 desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro
diff --git a/recipes/linux/cores-linux-x64-generic b/recipes/linux/cores-linux-x64-generic
index 07ba7be7..5806b22a 100644
--- a/recipes/linux/cores-linux-x64-generic
+++ b/recipes/linux/cores-linux-x64-generic
@@ -11,6 +11,7 @@ bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.g
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master YES GENERIC Makefile .
 chailove libretro-chailove https://github.com/libretro/libretro-chailove.git master YES GENERIC Makefile .
 citra libretro-citra https://github.com/libretro/citra.git master YES CMAKE Makefile build -DENABLE_LIBRETRO=1 -DENABLE_SDL2=0 -DENABLE_QT=0 -DDISABLE_LIBPNG=1 -DCMAKE_BUILD_TYPE="Release" -DENABLE_WEB_SERVICE=0 --target citra_libretro
+citra_canary libretro-citra_canary https://github.com/libretro/citra.git canary YES CMAKE Makefile build -DENABLE_LIBRETRO=1 -DENABLE_SDL2=0 -DENABLE_QT=0 -DDISABLE_LIBPNG=1 -DCMAKE_BUILD_TYPE="Release" -DENABLE_WEB_SERVICE=0 --target citra_canary_libretro
 craft libretro-craft https://github.com/libretro/craft master YES GENERIC Makefile.libretro .
 crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master YES GENERIC Makefile .
 desmume libretro-desmume https://github.com/libretro/desmume.git master YES GENERIC Makefile.libretro desmume/src/frontend/libretro
diff --git a/recipes/windows/cores-windows-x64_seh-noccache b/recipes/windows/cores-windows-x64_seh-noccache
index b81fa3df..f6ad2f0c 100644
--- a/recipes/windows/cores-windows-x64_seh-noccache
+++ b/recipes/windows/cores-windows-x64_seh-noccache
@@ -1,3 +1,4 @@
 citra libretro-citra https://github.com/libretro/citra.git master YES CMAKE Makefile build -G "MSYS Makefiles" -DENABLE_LIBRETRO=1 -DENABLE_SDL2=0 -DENABLE_QT=0 -DDISABLE_LIBPNG=1 -DENABLE_WEB_SERVICE=0 -DCMAKE_BUILD_TYPE="Release" --target citra_libretro
+citra_canary libretro-citra_canary https://github.com/libretro/citra.git canary YES CMAKE Makefile build -G "MSYS Makefiles" -DENABLE_LIBRETRO=1 -DENABLE_SDL2=0 -DENABLE_QT=0 -DDISABLE_LIBPNG=1 -DENABLE_WEB_SERVICE=0 -DCMAKE_BUILD_TYPE="Release" --target citra_canary_libretro
 px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES GENERIC Makefile.libretro .
 thepowdertoy libretro-thepowdertoy https://github.com/libretro/ThePowderToy.git master YES CMAKE Makefile build -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE="Release"
diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh
index 9f04c127..6ce94b92 100644
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@@ -721,6 +721,14 @@ libretro_citra_git_url="https://github.com/libretro/citra.git"
 libretro_citra_git_submodules="yes"
 libretro_citra_build_opengl="yes"
 
+include_core_citra_canary() {
+	register_module core "citra_canary" -ios -theos_ios -ngc -ps3 -psp1 -qnx -wii
+}
+libretro_citra_canary_name="Citra Canary"
+libretro_citra_canary_git_url="https://github.com/libretro/citra.git"
+libretro_citra_canary_git_submodules="yes"
+libretro_citra_canary_build_opengl="yes"
+
 include_core_thepowdertoy() {
 	register_module core "thepowdertoy" -ios -theos_ios -ngc -ps3 -psp1 -qnx -wii
 }