diff --git a/.cirrus.yml b/.cirrus.yml
index 67098637..edac7a65 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -4,7 +4,7 @@
 # snes9x
 ################################################################################
 
-snes9x_linux-amd64_task:
+snes9x_linux-gtk-amd64_task:
   container:
     image: gcc:latest
 
@@ -19,10 +19,54 @@ snes9x_linux-amd64_task:
   package_script:
     - mkdir snes9x
     - cp -ar build/snes9x-gtk README.md LICENSE docs data gtk/AUTHORS snes9x/
-    - tar -caf "snes9x-${CIRRUS_CHANGE_IN_REPO}.txz" snes9x
+    - tar -caf "snes9x-gtk-${CIRRUS_CHANGE_IN_REPO}.txz" snes9x
 
   build_artifacts:
-    path: "snes9x-${CIRRUS_CHANGE_IN_REPO}.txz"
+    path: "snes9x-gtk-${CIRRUS_CHANGE_IN_REPO}.txz"
+
+
+snes9x_linux-x11-amd64_task:
+  container:
+    image: gcc:latest
+
+  setup_script:
+    - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install libxv-dev libxinerama-dev
+
+  compile_script:
+    - cd unix
+    - touch configure
+    - ./configure
+    - make -j2
+
+  package_script:
+    - mkdir snes9x
+    - cp -ar unix/snes9x unix/docs unix/snes9x.conf.default README.md LICENSE data snes9x/
+    - tar -caf "snes9x-x11-${CIRRUS_CHANGE_IN_REPO}.txz" snes9x
+
+  build_artifacts:
+    path: "snes9x-x11-${CIRRUS_CHANGE_IN_REPO}.txz"
+
+
+snes9x_freebsd-x11-amd64_task:
+  freebsd_instance:
+    image: freebsd-12-1-release-amd64
+
+  setup_script:
+    - pkg install -y gmake pkgconf minizip libX11 libXext
+
+  compile_script:
+    - cd unix
+    - touch configure
+    - ./configure
+    - gmake -j2
+
+  package_script:
+    - mkdir snes9x
+    - cp -a unix/snes9x unix/docs unix/snes9x.conf.default README.md LICENSE data snes9x/
+    - tar -caf "snes9x-x11-${CIRRUS_CHANGE_IN_REPO}.txz" snes9x
+
+  build_artifacts:
+    path: "snes9x-x11-${CIRRUS_CHANGE_IN_REPO}.txz"
 
 
 snes9x_macOS-amd64_task:
diff --git a/README.md b/README.md
index 95cd0d02..54b38fbc 100644
--- a/README.md
+++ b/README.md
@@ -11,17 +11,21 @@ Download nightly builds from continuous integration:
 
 ### snes9x
 
-| OS      | status                                     |
-|---------|--------------------------------------------|
-| Windows | [![Status][s9x-win-all]][appveyor]        |
-| Linux   | [![Status][snes9x_linux-amd64]][cirrus-ci] |
-| macOS   | [![Status][snes9x_macOS-amd64]][cirrus-ci] |
+| OS            | status                                           |
+|---------------|--------------------------------------------------|
+| Windows       | [![Status][s9x-win-all]][appveyor]               |
+| Linux (GTK)   | [![Status][snes9x_linux-gtk-amd64]][cirrus-ci]   |
+| Linux (X11)   | [![Status][snes9x_linux-x11-amd64]][cirrus-ci]   |
+| FreeBSD (X11) | [![Status][snes9x_freebsd-x11-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_linux-gtk-amd64]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=snes9x_linux-gtk-amd64
+[snes9x_linux-x11-amd64]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=snes9x_linux-x11-amd64
+[snes9x_freebsd-x11-amd64]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=snes9x_freebsd-x11-amd64
 [snes9x_macOS-amd64]: https://api.cirrus-ci.com/github/snes9xgit/snes9x.svg?task=snes9x_macOS-amd64
 
 ### libretro core