diff --git a/.gitignore b/.gitignore
index 2e67f12d..81aa6085 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 *.orig
 *~
 *.swp
-
+.DS_Store
 *_enterprise.*
 .settings/
 
diff --git a/client/macosx/.gitignore b/client/macosx/.gitignore
new file mode 100644
index 00000000..144568b8
--- /dev/null
+++ b/client/macosx/.gitignore
@@ -0,0 +1,3 @@
+build
+dist
+udsclient.dmg
diff --git a/client/macosx/Info.plist b/client/macosx/Info.plist
new file mode 100644
index 00000000..a34f9069
--- /dev/null
+++ b/client/macosx/Info.plist
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>udsclient</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeOSTypes</key>
+			<array>
+				<string>****</string>
+				<string>fold</string>
+				<string>disk</string>
+			</array>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>udsclient</string>
+	<key>CFBundleIconFile</key>
+	<string>PythonApplet.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.openuds.udsclient</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>udsclient</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.0.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>0.0.0</string>
+	<key>CFBundleURLTypes</key>
+        <array>
+            <dict>
+                <key>CFBundleURLName</key>
+                <string>UDS Client</string>
+                <key>CFBundleURLSchemes</key>
+                <array>
+                    <string>uds</string>
+                </array>
+            </dict>
+        </array>
+	<key>LSHasLocalizedDisplayName</key>
+	<false/>
+	<key>NSAppleScriptEnabled</key>
+	<false/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright not specified</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>PyMainFileNames</key>
+	<array>
+		<string>__boot__</string>
+	</array>
+	<key>PyOptions</key>
+	<dict>
+		<key>alias</key>
+		<true/>
+		<key>argv_emulation</key>
+		<true/>
+		<key>emulate_shell_environment</key>
+		<false/>
+		<key>no_chdir</key>
+		<false/>
+		<key>prefer_ppc</key>
+		<false/>
+		<key>site_packages</key>
+		<false/>
+		<key>use_faulthandler</key>
+		<false/>
+		<key>use_pythonpath</key>
+		<false/>
+		<key>verbose</key>
+		<false/>
+	</dict>
+	<key>PyResourcePackages</key>
+	<array>
+	</array>
+	<key>PyRuntimeLocations</key>
+	<array>
+		<string>@executable_path/../Frameworks/Python.framework/Versions/2.7/Python</string>
+		<string>/usr/local/Cellar/python/2.7.9/Frameworks/Python.framework/Versions/2.7/Python</string>
+	</array>
+	<key>PythonInfoDict</key>
+	<dict>
+		<key>PythonExecutable</key>
+		<string>/usr/local/opt/python/bin/python2.7</string>
+		<key>PythonLongVersion</key>
+		<string>2.7.9 (default, Feb 10 2015, 03:29:19) 
+[GCC 4.2.1 Compatible Apple LLVM 6.0 (clang-600.0.56)]</string>
+		<key>PythonShortVersion</key>
+		<string>2.7</string>
+		<key>py2app</key>
+		<dict>
+			<key>alias</key>
+			<true/>
+			<key>template</key>
+			<string>app</string>
+			<key>version</key>
+			<string>0.9</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/client/macosx/build.sh b/client/macosx/build.sh
new file mode 100755
index 00000000..5145d088
--- /dev/null
+++ b/client/macosx/build.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+python setup.py py2app --optimize 2 --plist Info.plist
+rm udsclient.dmg 
+hdiutil create -srcfolder dist/udsclient.app udsclient.dmg
diff --git a/client/macosx/setup.py b/client/macosx/setup.py
new file mode 100644
index 00000000..4f1a4bca
--- /dev/null
+++ b/client/macosx/setup.py
@@ -0,0 +1,22 @@
+"""
+This is a setup.py script generated by py2applet
+
+Usage:
+    python setup.py py2app
+"""
+
+from setuptools import setup
+
+APP = ['udsclient.py']
+DATA_FILES = []
+OPTIONS = {
+	'argv_emulation': True,
+	'plist': 'Info.plist',
+}
+
+setup(
+    app=APP,
+    data_files=DATA_FILES,
+    options={'py2app': OPTIONS},
+    setup_requires=['py2app'],
+)
diff --git a/client/macosx/test.html b/client/macosx/test.html
new file mode 100644
index 00000000..ac73805e
--- /dev/null
+++ b/client/macosx/test.html
@@ -0,0 +1,6 @@
+<html>
+<head></head>
+<body>
+<a href="uds://test">Test uds</a>
+</body>
+</html>
diff --git a/client/macosx/udsclient.py b/client/macosx/udsclient.py
new file mode 100755
index 00000000..fd8804c3
--- /dev/null
+++ b/client/macosx/udsclient.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import Tkinter
+
+top = Tkinter.Tk()
+
+top.mainloop()