diff --git a/.cirrus.yml b/.cirrus.yml
index fdff5fba..67098637 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,6 +1,10 @@
 # vim: sts=2 sw=2 ai
 
-linux_task:
+################################################################################
+# snes9x
+################################################################################
+
+snes9x_linux-amd64_task:
   container:
     image: gcc:latest
 
@@ -21,7 +25,7 @@ linux_task:
     path: "snes9x-${CIRRUS_CHANGE_IN_REPO}.txz"
 
 
-macOS_task:
+snes9x_macOS-amd64_task:
   osx_instance:
     image: mojave-xcode
 
@@ -36,3 +40,123 @@ macOS_task:
   build_artifacts:
     path: "snes9x-${CIRRUS_CHANGE_IN_REPO}.zip"
 
+################################################################################
+# libretro
+################################################################################
+
+libretro_linux-amd64_task:
+  container:
+    image: gcc:latest
+  compile_script:
+    - make -j2 -C libretro
+  build_artifacts:
+    path: "libretro/snes9x_libretro.so"
+
+
+libretro_linux-i386_task:
+  container:
+    image: dockcross/linux-x86
+  compile_script:
+    - make -j2 -C libretro
+  build_artifacts:
+    path: "libretro/snes9x_libretro.so"
+
+
+libretro_linux-armhf_task:
+  container:
+    image: dockcross/linux-armv7
+  compile_script:
+    - make -j2 -C libretro
+  build_artifacts:
+    path: "libretro/snes9x_libretro.so"
+
+
+libretro_linux-armv7-neon-hf_task:
+  container:
+    image: dockcross/linux-armv7
+  compile_script:
+    - make -j2 -C libretro platform=unix-armv7-neon-hardfloat
+  build_artifacts:
+    path: "libretro/snes9x_libretro.so"
+
+
+libretro_linux-arm64_task:
+  container:
+    image: dockcross/linux-arm64
+  compile_script:
+    - make -j2 -C libretro
+  build_artifacts:
+    path: "libretro/snes9x_libretro.so"
+
+
+libretro_android-arm_task:
+  container:
+    image: dockcross/android-arm
+  compile_script:
+    - make -j2 -C libretro platform=unix
+  build_artifacts:
+    path: "libretro/snes9x_libretro.so"
+
+
+libretro_android-arm64_task:
+  container:
+    image: dockcross/android-arm64
+  compile_script:
+    - make -j2 -C libretro platform=unix-arm64
+  build_artifacts:
+    path: "libretro/snes9x_libretro.so"
+
+
+libretro_emscripten_task:
+  container:
+    image: gcc:latest
+  compile_script:
+    - make -j2 -C libretro platform=emscripten
+  build_artifacts:
+    path: "libretro/snes9x_libretro_emscripten.bc"
+
+
+libretro_macOS-amd64_task:
+  osx_instance:
+    image: mojave-xcode
+  compile_script:
+    - make -j2 -C libretro
+  build_artifacts:
+    path: "libretro/snes9x_libretro.dylib"
+
+
+libretro_nintendo-wii_task:
+  container:
+    image: devkitpro/devkitppc
+  compile_script:
+    - make -j2 -C libretro platform=wii
+  build_artifacts:
+    path: "libretro/snes9x_libretro_wii.a"
+
+
+libretro_nintendo-switch-libnx_task:
+  container:
+    image: devkitpro/devkita64
+  compile_script:
+    - make -j2 -C libretro platform=libnx
+  build_artifacts:
+    path: "libretro/snes9x_libretro_libnx.a"
+
+
+libretro_nintendo-ngc_task:
+  container:
+    image: devkitpro/devkitppc
+  compile_script:
+    - make -j2 -C libretro platform=ngc
+  build_artifacts:
+    path: "libretro/snes9x_libretro_ngc.a"
+
+
+libretro_playstation-psp_task:
+  container:
+    image: bkcsoft/psptoolchain
+  compile_script:
+    - make -j2 -C libretro platform=unix
+  build_artifacts:
+    path: "libretro/snes9x_libretro.so"
+
diff --git a/README.md b/README.md
index efe7f58d..95cd0d02 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,49 @@ Please check the [Wiki](https://github.com/snes9xgit/snes9x/wiki) for additional
 
 Download nightly builds from continuous integration:
 
-[![Build Status](https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=linux)](https://cirrus-ci.com/github/snes9xgit/snes9x)
-[![Build Status](https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=macOS)](https://cirrus-ci.com/github/snes9xgit/snes9x)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/snes9xgit/snes9x?branch=master&svg=true)](https://ci.appveyor.com/project/snes9x/snes9x)
+### snes9x
 
+| OS      | status                                     |
+|---------|--------------------------------------------|
+| Windows | [![Status][s9x-win-all]][appveyor]        |
+| Linux   | [![Status][snes9x_linux-amd64]][cirrus-ci] |
+| macOS   | [![Status][snes9x_macOS-amd64]][cirrus-ci] |
+
+[appveyor]: https://ci.appveyor.com/project/snes9x/snes9x
+[cirrus-ci]: http://cirrus-ci.com/github/snes9xgit/snes9x
+
+[s9x-win-all]: https://ci.appveyor.com/api/projects/status/github/snes9xgit/snes9x?branch=master&svg=true
+[snes9x_linux-amd64]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=snes9x_linux-amd64
+[snes9x_macOS-amd64]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=snes9x_macOS-amd64
+
+### libretro core
+
+| OS                  | status                                                  |
+|---------------------|---------------------------------------------------------|
+| Linux/amd64         | [![Status][libretro_linux-amd64]][cirrus-ci]            |
+| Linux/i386          | [![Status][libretro_linux-i386]][cirrus-ci]             |
+| Linux/armhf         | [![Status][libretro_linux-armhf]][cirrus-ci]            |
+| Linux/armv7-neon-hf | [![Status][libretro_linux-armv7-neon-hf]][cirrus-ci]    |
+| Linux/arm64         | [![Status][libretro_linux-arm64]][cirrus-ci]            |
+| Android/arm         | [![Status][libretro_android-arm]][cirrus-ci]            |
+| Android/arm64       | [![Status][libretro_android-arm64]][cirrus-ci]          |
+| Emscripten          | [![Status][libretro_emscripten]][cirrus-ci]             |
+| macOS/amd64         | [![Status][libretro_macOS-amd64]][cirrus-ci]            |
+| Nintendo Wii        | [![Status][libretro_nintendo-wii]][cirrus-ci]           |
+| Nintendo Switch     | [![Status][libretro_nintendo-switch-libnx]][cirrus-ci]  |
+| Nintendo GameCube   | [![Status][libretro_nintendo-ngc]][cirrus-ci]           |
+| PSP                 | [![Status][libretro_playstation-psp]][cirrus-ci]        |
+
+[libretro_linux-amd64]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=libretro_linux-amd64
+[libretro_linux-i386]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=libretro_linux-i386
+[libretro_linux-armhf]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=libretro_linux-armhf
+[libretro_linux-armv7-neon-hf]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=libretro_linux-armv7-neon-hf
+[libretro_linux-arm64]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=libretro_linux-arm64
+[libretro_android-arm]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=libretro_android-arm
+[libretro_android-arm64]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=libretro_android-arm64
+[libretro_emscripten]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=libretro_emscripten
+[libretro_macOS-amd64]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=libretro_macOS-amd64
+[libretro_nintendo-wii]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=libretro_nintendo-wii
+[libretro_nintendo-switch-libnx]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=libretro_nintendo-switch-libnx
+[libretro_nintendo-ngc]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=libretro_nintendo-ngc
+[libretro_playstation-psp]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=libretro_playstation-psp