diff --git a/.travis.yml b/.travis.yml
index d93fc47..91f88f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ matrix:
     compiler: clang
 
     script:
-      - ./macbuild.sh
+      - ./unixbuild.sh
 
     deploy:
       provider: releases
@@ -20,27 +20,33 @@ matrix:
         tags: true
 
   - os: linux
+    dist: trusty
     compiler: clang
 
     before_install:
-      - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
       - sudo apt-get update -qq
-      - sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev
+      - sudo apt-get install -qq qt5-default qt5-qmake qtbase5-dev-tools cmake
 
     script:
-      - cd UEFITool
-      - qmake -qt=qt5 uefitool.pro
-      - make
+      - ./unixbuild.sh
 
   - os: linux
+    dist: trusty
     compiler: gcc
 
     before_install:
-      - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
       - sudo apt-get update -qq
-      - sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev
+      - sudo apt-get install -qq qt5-default qt5-qmake qtbase5-dev-tools cmake
 
     script:
-      - cd UEFITool
-      - qmake -qt=qt5 uefitool.pro
-      - make
+      - ./unixbuild.sh
+
+    deploy:
+      provider: releases
+      skip_cleanup: true
+      file: "dist/*.zip"
+      file_glob: true
+      api_key:
+        secure: "WjYd93lVLKHULBpUXS/WtGrkdXyAwxHOUnLJotyDmQipAQP5Ox7Kj12JwkSJGEmVOEdcbIQJyi0QxPjn1UYbYsAt6Op8zrjnYLS4G4fMdBtcxprWzid85uTW7oAAIFs7ygMVhpzxRKpu70yNb683vbThqNmaOu6RyG9aJOLtPAg="
+      on:
+        tags: true
diff --git a/macbuild.sh b/macbuild.sh
deleted file mode 100755
index 8587c3a..0000000
--- a/macbuild.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-if [ ! -d /opt/qt56sm ]; then
-  curl -L -o /tmp/qt-5.6.3-static-mac.zip https://github.com/distdb/qtbuilds/blob/master/qt-5.6.3-static-mac.zip?raw=true || exit 1
-  qtsum=$(shasum -a 256 /tmp/qt-5.6.3-static-mac.zip | cut -f1 -d' ')
-  qtexpsum="214d22d8572ea6162753c8dd251d79275f3b22d49204718c637d722409e0cfcb"
-  if [ "$qtsum" != "$qtexpsum" ]; then
-    echo "Qt hash $qtsum does not match $qtexpsum"
-    exit 1
-  fi
-  sudo mkdir -p /opt || exit 1
-  cd /opt || exit 1
-  sudo unzip -q /tmp/qt-5.6.3-static-mac.zip || exit 1
-  cd - || exit 1
-fi
-
-export PATH="/opt/qt56sm/bin:$PATH"
-
-echo "Attempting to build UEFITool NE for macOS..."
-
-UEFITOOL_VER=$(cat UEFITool/uefitool.cpp               | grep ^version             | cut -d'"' -f2 | sed 's/NE alpha /A/')
-UEFIDUMP_VER=$(cat UEFIDump/uefidump_main.cpp          | grep '"UEFIDump [0-9]'    | cut -d'"' -f2 | cut -d' ' -f2)
-UEFIEXTRACT_VER=$(cat UEFIExtract/uefiextract_main.cpp | grep '"UEFIExtract [0-9]' | cut -d'"' -f2 | cut -d' ' -f2)
-UEFIFIND_VER=$(cat UEFIFind/uefifind_main.cpp          | grep '"UEFIFind [0-9]'    | cut -d'"' -f2 | cut -d' ' -f2)
-
-build_tool() {
-  echo "Building $1 $2"
-  # Check version
-  if [ "$(echo "$2" | grep '^[0-9]*\.[0-9]*\.[0-9]*$')" != "$2" ] && [ "$(echo "$2" | grep '^A[0-9]*$')" != "$2" ]; then
-    echo "Invalid $1 version!"
-    exit 1
-  fi
-  # Tools are in subdirectories
-  cd "$1" || exit 1
-
-  # Build
-  if [ "$3" != "" ]; then
-    qmake $3 QMAKE_CXXFLAGS+=-flto QMAKE_LFLAGS+=-flto CONFIG+=optimize_size || exit 1
-  else
-    cmake -G "Unix Makefiles" -DCMAKE_CXX_FLAGS="-stdlib=libc++ -flto -Os -mmacosx-version-min=10.7" -DCMAKE_C_FLAGS="-flto -Os -mmacosx-version-min=10.7" || exit 1
-  fi
-  make || exit 1
-
-  # Archive
-  if [ "$1" = "UEFITool" ]; then
-    strip -x UEFITool.app/Contents/MacOS/UEFITool || exit 1
-    zip -qry ../dist/"${1}_NE_${2}_mac.zip" UEFITool.app "${4}" || exit 1
-  else
-    strip -x "$1" || exit 1
-    zip -qry ../dist/"${1}_NE_${2}_mac.zip" "${1}" "${4}" || exit 1
-  fi
-
-  # Return to parent
-  cd - || exit 1
-}
-
-rm -rf dist
-mkdir -p dist || exit 1
-
-build_tool UEFITool    "$UEFITOOL_VER"     uefitool.pro
-build_tool UEFIDump    "$UEFIDUMP_VER"     ""
-build_tool UEFIExtract "$UEFIEXTRACT_VER"  uefiextract.pro
-build_tool UEFIFind    "$UEFIFIND_VER"     uefifind.pro
-
-exit 0
diff --git a/unixbuild.sh b/unixbuild.sh
new file mode 100755
index 0000000..33d0d9b
--- /dev/null
+++ b/unixbuild.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+UTARGET=$(uname)
+
+if [ "$UTARGET" = "Darwin" ]; then
+  export UPLATFORM="mac"
+elif [ "$UTARGET" = "Linux" ]; then
+  export UPLATFORM="linux_$(uname -m)"
+else
+  # Fallback to something...
+  export UPLATFORM="$UTARGET"
+fi
+
+if [ "$UPLATFORM" = "mac" ]; then
+  if [ ! -d /opt/qt56sm ]; then
+    curl -L -o /tmp/qt-5.6.3-static-mac.zip https://github.com/distdb/qtbuilds/blob/master/qt-5.6.3-static-mac.zip?raw=true || exit 1
+    qtsum=$(shasum -a 256 /tmp/qt-5.6.3-static-mac.zip | cut -f1 -d' ')
+    qtexpsum="214d22d8572ea6162753c8dd251d79275f3b22d49204718c637d722409e0cfcb"
+    if [ "$qtsum" != "$qtexpsum" ]; then
+      echo "Qt hash $qtsum does not match $qtexpsum"
+      exit 1
+    fi
+    sudo mkdir -p /opt || exit 1
+    cd /opt || exit 1
+    sudo unzip -q /tmp/qt-5.6.3-static-mac.zip || exit 1
+    cd - || exit 1
+  fi
+
+  export PATH="/opt/qt56sm/bin:$PATH"
+fi
+
+echo "Attempting to build UEFITool NE for ${UPLATFORM}..."
+
+UEFITOOL_VER=$(cat UEFITool/uefitool.cpp               | grep ^version             | cut -d'"' -f2 | sed 's/NE alpha /A/')
+UEFIDUMP_VER=$(cat UEFIDump/uefidump_main.cpp          | grep '"UEFIDump [0-9]'    | cut -d'"' -f2 | cut -d' ' -f2)
+UEFIEXTRACT_VER=$(cat UEFIExtract/uefiextract_main.cpp | grep '"UEFIExtract [0-9]' | cut -d'"' -f2 | cut -d' ' -f2)
+UEFIFIND_VER=$(cat UEFIFind/uefifind_main.cpp          | grep '"UEFIFind [0-9]'    | cut -d'"' -f2 | cut -d' ' -f2)
+
+build_tool() {
+  echo "Building $1 $2"
+  # Check version
+  if [ "$(echo "$2" | grep '^[0-9]*\.[0-9]*\.[0-9]*$')" != "$2" ] && [ "$(echo "$2" | grep '^A[0-9]*$')" != "$2" ]; then
+    echo "Invalid $1 version!"
+    exit 1
+  fi
+  # Tools are in subdirectories
+  cd "$1" || exit 1
+
+  # Build
+  if [ "$3" != "" ]; then
+    # -flto is flawed on CI atm
+    if [ "$UPLATFORM" = "mac" ]; then
+      qmake $3 QMAKE_CXXFLAGS+=-flto QMAKE_LFLAGS+=-flto CONFIG+=optimize_size || exit 1
+    else
+      qmake $3 CONFIG+=optimize_size
+    fi
+  else
+    if [ "$UPLATFORM" = "mac" ]; then
+      cmake -G "Unix Makefiles" -DCMAKE_CXX_FLAGS="-stdlib=libc++ -flto -Os -mmacosx-version-min=10.7" -DCMAKE_C_FLAGS="-flto -Os -mmacosx-version-min=10.7" || exit 1
+    else
+      cmake -G "Unix Makefiles" -DCMAKE_CXX_FLAGS="-Os" -DCMAKE_C_FLAGS="-Os" || exit 1
+    fi
+  fi
+  make || exit 1
+
+  # Archive
+  if [ "$1" = "UEFITool" ] && [ "$UPLATFORM" = "mac" ]; then
+    strip -x UEFITool.app/Contents/MacOS/UEFITool || exit 1
+    zip -qry ../dist/"${1}_NE_${2}_${UPLATFORM}.zip" UEFITool.app "${4}" || exit 1
+  else
+    strip -x "$1" || exit 1
+    zip -qry ../dist/"${1}_NE_${2}_${UPLATFORM}.zip" "${1}" "${4}" || exit 1
+  fi
+
+  # Return to parent
+  cd - || exit 1
+}
+
+rm -rf dist
+mkdir -p dist || exit 1
+
+build_tool UEFITool    "$UEFITOOL_VER"     uefitool.pro
+build_tool UEFIDump    "$UEFIDUMP_VER"     ""
+build_tool UEFIExtract "$UEFIEXTRACT_VER"  uefiextract.pro
+build_tool UEFIFind    "$UEFIFIND_VER"     uefifind.pro
+
+exit 0