diff --git a/.travis.yml b/.travis.yml
index 5bd63534e..134b7af4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ install:
 - npm install --global esy@0.3.0
 - esy install
 script:
-- esy build
+- travis_wait 40 esy build
 cache:
     timeout: 360
     directories:
diff --git a/esy/configure-windows.sh b/esy/configure-windows.sh
index ace617be2..50c4efb1d 100644
--- a/esy/configure-windows.sh
+++ b/esy/configure-windows.sh
@@ -1,2 +1,7 @@
 cd _build
-./configure --prefix=$cur__install --host=x86_64-w64-mingw32
+
+INSTALL_PATH="$(cygpath -u $cur__install)"
+
+echo "Install: $INSTALL_PATH"
+
+cmake -G "Unix Makefiles" ../harfbuzz-1.9.0 -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DCMAKE_LINKER=/usr/bin/x86_64-w64-mingw32-ld -DCMAKE_AR=/usr/bin/x86_64-w64-mingw32-ar -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH
diff --git a/esy/test.sh b/esy/test.sh
index cde13cf0f..4dc124b83 100755
--- a/esy/test.sh
+++ b/esy/test.sh
@@ -8,9 +8,15 @@ if which x86_64-w64-mingw32-gcc; then
     # Copy runtime mingw files
     BUILDDIR=$(pwd)/esy
     cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll $BUILDDIR/.
+    ADDITIONAL_LIBS=
 else
     CC=gcc
     BUILDDIR=$(pwd)/_build
+    if [ "$(uname)" == "Darwin"]; then
+        ADDITIONAL_LIBS=-framework Foundation
+    else
+        ADDITIONAL_LIBS=-lm
+    fi
 fi
 
 echo "Using build directory: $BUILDDIR"
@@ -31,5 +37,5 @@ cp $cur__bin/*.dll .
 export PATH=$PATH:$cur__bin:$cur__lib
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$cur__lib
 
-$CC $ROOTDIR/esy/test.c -o test.exe -std=c99 -I$INCLUDE -L$cur__lib -lharfbuzz
+$CC $ROOTDIR/esy/test.c -o test.exe -std=c99 -I$INCLUDE -L$cur__lib -lharfbuzz $ADDITIONAL_LIBS
 ./test.exe $ROOTDIR/esy/Roboto-Regular.ttf "test=>text"
diff --git a/package.json b/package.json
index 264396b8e..1fd4dbc81 100644
--- a/package.json
+++ b/package.json
@@ -27,5 +27,12 @@
     }
   },
   "dependencies": {
+      "esy-cmake": "*"
+  },
+  "resolutions": {
+      "esy-cmake": "github:bryphe/esy-cmake#5a40a8e"
+  },
+  "devDependencies": {
+      "esy-cmake": "*"
   }
 }