diff --git a/packaging/osx/SConscript b/packaging/osx/SConscript
index f2b712a5..2f0223d5 100644
--- a/packaging/osx/SConscript
+++ b/packaging/osx/SConscript
@@ -63,10 +63,10 @@ env.Install(
     root.Dir(relative(etc_freelan_path)),
     configurations,
 )
-env.GenerateScript(
+env.AddPostAction(env.GenerateScript(
     root.File(relative(uninstall_script)),
     uninstall_script_source,
-)
+), Action("chmod 0755 $TARGET"))
 env.Plist(
     root.File(relative(launch_daemon_script)),
     launch_daemon_script_source,
@@ -98,7 +98,7 @@ final_package = env.ProductBuild(
         'version': env.defines.version_str,
     }),
     PRODUCTBUILD_RESOURCES=resources,
-    PRODUCTBUILD_PACKAGE_PATH=[env.Dir('.')],
+    PRODUCTBUILD_PACKAGE_PATH=[env.Dir('.'), env.Dir('third-party')],
 )
 
 Return('final_package')
diff --git a/packaging/osx/distribution.xml.in b/packaging/osx/distribution.xml.in
index 4a1a289c..5529fad8 100644
--- a/packaging/osx/distribution.xml.in
+++ b/packaging/osx/distribution.xml.in
@@ -3,22 +3,32 @@
 	<title>FreeLAN {version}</title>
 	<organization>org.freelan</organization>
 	<domains enable_localSystem="true"/>
-	<options customize="never" require-scripts="true" rootVolumeOnly="true" />
+	<options customize="always" require-scripts="true" rootVolumeOnly="true" />
 
 	<!-- Define documents displayed at various steps -->
 	<license    file="license.html"    mime-type="text/html" />
 	<conclusion file="conclusion.html" mime-type="text/html" />
 
 	<!-- List all component packages -->
-	<pkg-ref id="org.freelan.freelan" version="1" auth="root">org.freelan.freelan.pkg</pkg-ref>
+	<pkg-ref id="org.freelan.freelan" auth="root">org.freelan.freelan.pkg</pkg-ref>
+	<pkg-ref id="tap" auth="root">tap.pkg</pkg-ref>
+	<pkg-ref id="tun" auth="root">tun.pkg</pkg-ref>
 
 	<!-- List them again here. They can now be organized as a hierarchy if you want. -->
 	<choices-outline>
 		<line choice="org.freelan.freelan"/>
+		<line choice="tap"/>
+		<line choice="tun"/>
 	</choices-outline>
 
 	<!-- Define each choice above -->
-	<choice id="org.freelan.freelan" visible="false" title="FreeLAN" description="The FreeLAN binary" start_selected="true">
+	<choice id="org.freelan.freelan" enabled="false" title="FreeLAN" description="The FreeLAN binary" start_selected="true">
 		<pkg-ref id="org.freelan.freelan"/>
 	</choice>
+	<choice id="tap" visible="true" title="TAP kernel driver" description="Install the TAP kernel driver for OS X by Mattias Nissler - TunTap OS X" start_selected="true">
+		<pkg-ref id="tap"/>
+	</choice>
+	<choice id="tun" visible="true" title="TUN kernel driver" description="Install the TUN kernel driver for OS X by Mattias Nissler - TunTap OS X" start_selected="true">
+		<pkg-ref id="tun"/>
+	</choice>
 </installer-gui-script>
diff --git a/packaging/osx/productbuild.py b/packaging/osx/productbuild.py
index fda5b884..98156e7d 100644
--- a/packaging/osx/productbuild.py
+++ b/packaging/osx/productbuild.py
@@ -44,8 +44,10 @@ def productbuild_scanner(node, env, paths):
     for package in packages:
         for path in paths:
             package_file = env.Dir(path).File(package)
-            result.append(package_file)
-            break
+
+            if package_file.exists() or package_file.has_builder():
+                result.append(package_file)
+                break
 
     return result
 
diff --git a/packaging/osx/third-party/.gitignore b/packaging/osx/third-party/.gitignore
new file mode 100644
index 00000000..1bb09658
--- /dev/null
+++ b/packaging/osx/third-party/.gitignore
@@ -0,0 +1 @@
+!*.pkg
diff --git a/packaging/osx/third-party/tap.pkg b/packaging/osx/third-party/tap.pkg
new file mode 100644
index 00000000..020c5ce6
Binary files /dev/null and b/packaging/osx/third-party/tap.pkg differ
diff --git a/packaging/osx/third-party/tun.pkg b/packaging/osx/third-party/tun.pkg
new file mode 100644
index 00000000..8fddd6cb
Binary files /dev/null and b/packaging/osx/third-party/tun.pkg differ
diff --git a/packaging/osx/third-party/tuntap_20150118.pkg b/packaging/osx/third-party/tuntap_20150118.pkg
new file mode 100644
index 00000000..8f1434b9
Binary files /dev/null and b/packaging/osx/third-party/tuntap_20150118.pkg differ
diff --git a/packaging/osx/tuntap/tuntap_20150118.tar.gz b/packaging/osx/tuntap/tuntap_20150118.tar.gz
deleted file mode 100644
index 3dbbd0e7..00000000
Binary files a/packaging/osx/tuntap/tuntap_20150118.tar.gz and /dev/null differ