diff --git a/ZeroTierUI/Info.plist b/ZeroTierUI/Info.plist
new file mode 100644
index 000000000..06f680c64
--- /dev/null
+++ b/ZeroTierUI/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>CFBundleIconFile</key>
+	<string>zt1icon.icns</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleGetInfoString</key>
+	<string>ZeroTier One (Mac GUI)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleExecutable</key>
+	<string>ZeroTier One</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.zerotier.ZeroTierOne</string>
+</dict>
+</plist>
diff --git a/ZeroTierUI/ZeroTierUI.pro b/ZeroTierUI/ZeroTierUI.pro
index ff2cc6b4a..0bfcb819b 100644
--- a/ZeroTierUI/ZeroTierUI.pro
+++ b/ZeroTierUI/ZeroTierUI.pro
@@ -1,16 +1,12 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2013-11-13T15:03:09
-#
-#-------------------------------------------------
-
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
+QT       += core gui widgets
 TARGET = "ZeroTier One"
 TEMPLATE = app
 
+win32:RC_FILE = ZeroTierUI.rc
+mac:ICON = zt1icon.icns
+mac:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+mac:QMAKE_INFO_PLIST = Info.plist
+
 # ZeroTier One must be built before building this, since it links in the
 # client code and some stuff from Utils to talk to the running service.
 LIBS += ../node/*.o
diff --git a/ZeroTierUI/ZeroTierUI.rc b/ZeroTierUI/ZeroTierUI.rc
new file mode 100644
index 000000000..2c5365c0f
--- /dev/null
+++ b/ZeroTierUI/ZeroTierUI.rc
@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "zt1icon.ico"
diff --git a/ZeroTierUI/zt1icon.icns b/ZeroTierUI/zt1icon.icns
new file mode 100644
index 000000000..ce07eb9ea
Binary files /dev/null and b/ZeroTierUI/zt1icon.icns differ
diff --git a/ZeroTierUI/zt1icon.ico b/ZeroTierUI/zt1icon.ico
new file mode 100644
index 000000000..eb29c09bc
Binary files /dev/null and b/ZeroTierUI/zt1icon.ico differ