diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 296ac3cb..5cf20f58 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,12 +3,12 @@
 
 image: debian:stable
 
-linux-x86_64-binaries:
+higan-linux-x86_64-binaries:
   script:
     - apt-get update && apt-get -y install build-essential libgtk2.0-dev libpulse-dev mesa-common-dev libgtksourceview2.0-dev libcairo2-dev libsdl1.2-dev libxv-dev libao-dev libopenal-dev libudev-dev mkdocs
     - make -C genius
     - make -C icarus
-    - make -C higan
+    - make -C higan target=higan
     - LC_ALL=C.UTF-8 mkdocs build
     - mkdir higan-nightly
     - cp -a genius/out/genius higan-nightly/genius
@@ -24,7 +24,24 @@ linux-x86_64-binaries:
     paths:
       - higan-nightly/*
 
-windows-x86_64-binaries:
+bsnes-linux-x86_64-binaries:
+  script:
+    - apt-get update && apt-get -y install build-essential libgtk2.0-dev libpulse-dev mesa-common-dev libgtksourceview2.0-dev libcairo2-dev libsdl1.2-dev libxv-dev libao-dev libopenal-dev libudev-dev
+    - make -C icarus
+    - make -C higan target=bsnes
+    - mkdir bsnes-nightly
+    - cp -a icarus/out/icarus bsnes-nightly/icarus
+    - cp -a icarus/database bsnes-nightly/
+    - cp -a icarus/firmware bsnes-nightly/
+    - cp -a higan/out/bsnes bsnes-nightly/bsnes
+    - cp -a higan/systems/ bsnes-nightly/
+    - cp -a shaders bsnes-nightly/
+    - cp -a GPLv3.txt bsnes-nightly/
+  artifacts:
+    paths:
+      - bsnes-nightly/*
+
+higan-windows-x86_64-binaries:
   # This is a normal Windows cross-compile process, except that
   # nall::chrono tries to use clock_gettime on Windows even
   # though it's a POSIX function, and for some weird reason mingw has
@@ -35,7 +52,7 @@ windows-x86_64-binaries:
     # genius does not currently build on Windows due to lack of a combo edit control in hiro
     #- make -C genius platform=windows compiler="x86_64-w64-mingw32-g++ -static-libgcc -static-libstdc++" windres="x86_64-w64-mingw32-windres"
     - make -C icarus platform=windows compiler="x86_64-w64-mingw32-g++ -static-libgcc -static-libstdc++" windres="x86_64-w64-mingw32-windres"
-    - make -C higan platform=windows compiler="x86_64-w64-mingw32-g++ -static-libgcc -static-libstdc++" windres="x86_64-w64-mingw32-windres"
+    - make -C higan target=higan platform=windows compiler="x86_64-w64-mingw32-g++ -static-libgcc -static-libstdc++" windres="x86_64-w64-mingw32-windres"
     - LC_ALL=C.UTF-8 mkdocs build
     - mkdir higan-nightly
     #- cp -a genius/out/genius higan-nightly/genius.exe
@@ -51,6 +68,30 @@ windows-x86_64-binaries:
     paths:
       - higan-nightly/*
 
+bsnes-windows-x86_64-binaries:
+  # This is a normal Windows cross-compile process, except that
+  # nall::chrono tries to use clock_gettime on Windows even
+  # though it's a POSIX function, and for some weird reason mingw has
+  # clock_gettime() in the pthread library.
+  script:
+    - apt-get update && apt-get -y install build-essential mingw-w64
+    - sed -i -e 's/-lole32/& -static -lpthread/' nall/GNUmakefile
+    # genius does not currently build on Windows due to lack of a combo edit control in hiro
+    #- make -C genius platform=windows compiler="x86_64-w64-mingw32-g++ -static-libgcc -static-libstdc++" windres="x86_64-w64-mingw32-windres"
+    - make -C icarus platform=windows compiler="x86_64-w64-mingw32-g++ -static-libgcc -static-libstdc++" windres="x86_64-w64-mingw32-windres"
+    - make -C higan target=bsnes platform=windows compiler="x86_64-w64-mingw32-g++ -static-libgcc -static-libstdc++" windres="x86_64-w64-mingw32-windres"
+    - mkdir bsnes-nightly
+    - cp -a icarus/out/icarus bsnes-nightly/icarus.exe
+    - cp -a icarus/database bsnes-nightly/
+    - cp -a icarus/firmware bsnes-nightly/
+    - cp -a higan/out/bsnes bsnes-nightly/bsnes.exe
+    - cp -a higan/systems/ bsnes-nightly/
+    - cp -a shaders bsnes-nightly/
+    - cp -a GPLv3.txt bsnes-nightly/
+  artifacts:
+    paths:
+      - bsnes-nightly/*
+
 libretro-test:
   script:
     - apt-get update && apt-get -y install build-essential git