diff --git a/.travis.yml b/.travis.yml
index 05ecfe0..440d6e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,18 @@
 language: python
 matrix:
   include:
-   - python: "3.5"
-   - python: "nightly"
+   - os: linux
+     python: 3.5
+   - os: osx
+     language: generic
+   - os: linux
+     python: nightly
   allow_failures:
     # Doesn't currently work with pyinstaller
    - python: "nightly"
 
 before_install:
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./setup_venv_osx.sh; source venv/bin/activate; fi
  - "pip install pyinstaller"
 
 install:
diff --git a/aw-server b/aw-server
index 76dec73..bb353ea 160000
--- a/aw-server
+++ b/aw-server
@@ -1 +1 @@
-Subproject commit 76dec737a6e501b5203b159ce79e028891889bdd
+Subproject commit bb353eae5eb1414d816f22c90c995238208688fb
diff --git a/aw-watcher-afk b/aw-watcher-afk
index 6af565e..6c43b05 160000
--- a/aw-watcher-afk
+++ b/aw-watcher-afk
@@ -1 +1 @@
-Subproject commit 6af565eef72e731e944210a1b6a72b5a2ad0942a
+Subproject commit 6c43b05d061e062b76367c964b4ee165ac211b22
diff --git a/aw-watcher-x11 b/aw-watcher-x11
index 127bb5e..9a16c17 160000
--- a/aw-watcher-x11
+++ b/aw-watcher-x11
@@ -1 +1 @@
-Subproject commit 127bb5e3432bce701c1ab1a1abdd2e149440608e
+Subproject commit 9a16c17a4e46bfccf045b25717b6fa99e88355b8
diff --git a/build.sh b/build.sh
index 833620e..96d4cb0 100755
--- a/build.sh
+++ b/build.sh
@@ -4,7 +4,7 @@
 # NOTE: Highly WIP!
 #
 
-PYINSTALL_TARGETS=$(find -maxdepth 2 | egrep 'aw-.*/.*\.spec')
+PYINSTALL_TARGETS=$(find . -maxdepth 2 | egrep 'aw-.*/.*\.spec')
 
 function build_fail {
     echo "Failed to build $1"
diff --git a/setup_venv_osx.sh b/setup_venv_osx.sh
new file mode 100755
index 0000000..10d97b2
--- /dev/null
+++ b/setup_venv_osx.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+brew update;
+brew install python3;
+virtualenv venv -p python3;
+
+# Now run `source venv/bin/activate` in the shell where the virtualenv should be used