diff --git a/build.xml b/build.xml
index b1cff79de5..f337e094d8 100644
--- a/build.xml
+++ b/build.xml
@@ -482,7 +482,7 @@
         </delete>
     </target>
 
-    <target name="preppkg" depends="preppkg-linux, preppkg-windows, jbigi">
+    <target name="preppkg" depends="preppkg-linux, preppkg-osx, preppkg-windows, jbigi">
         <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
         <copy todir="pkg-temp/lib/wrapper/freebsd/">
             <fileset dir="installer/lib/wrapper/freebsd/" />
@@ -546,6 +546,13 @@
         </copy>
     </target>
 
+    <target name="preppkg-osx" depends="preppkg-linux">
+        <!--<copy file="installer/resources/I2P Router Console.webloc" todir="pkg-temp/" />-->
+        <copy todir="pkg-temp/Start I2P Router.app">
+	    <fileset dir="installer/resources/Start I2P Router.app" />
+	</copy>
+    </target>
+
     <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates">
         <!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
         <delete>
diff --git a/installer/install.xml b/installer/install.xml
index e16b077a6a..1e5b041fe6 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -135,6 +135,7 @@
             <parsable targetfile="$INSTALL_PATH/i2prouter" type="shell" os="unix|mac" />
             <parsable targetfile="$INSTALL_PATH/eepget" type="shell" os="unix|mac" />
             <parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell" os="unix|mac" />
+            <parsable targetfile="$INSTALL_PATH/Start I2P Router.app/Contents/MacOS/i2prouter" type="shell" os="mac" />
             
 	    <conditions>
 	        <condition type="variable" id="is64bit">
@@ -180,6 +181,12 @@
                 <args><arg value="$INSTALL_PATH\lib\wrapper" /></args></executable>
             <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
                 <args><arg value="$INSTALL_PATH\eepget" /></args></executable>
+	    <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
+	        <args><arg value="$INSTALL_PATH/Start I2P Router.app" /></args></executable>
+	    <!-- Placeholder for an OSX 'shortcut' to the router console
+	    <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
+	        <args><arg value="$INSTALL_PATH/I2P Router Console.webloc" /></args></executable>
+		-->
 
             <!-- workaround for vista permission problems - see comments above -->
             <executable targetfile="$INSTALL_PATH/fixperms.bat" type="bin" stage="postinstall" keep="true" failure="warn"
diff --git a/installer/resources/Start I2P Router.app/Contents/Info.plist b/installer/resources/Start I2P Router.app/Contents/Info.plist
new file mode 100644
index 0000000000..afa5b5f6ff
--- /dev/null
+++ b/installer/resources/Start I2P Router.app/Contents/Info.plist	
@@ -0,0 +1,45 @@
+<?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>CFBundleExecutable</key>
+	<string>i2prouter</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Public Domain</string>
+	<key>CFBundleGetInfoString</key>
+	<string>0.0.1</string>
+	<key>CFBundleIconFile</key>
+	<string>i2p</string>
+	<key>CFBundleIdentifier</key>
+	<string>de.i2p2</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>I2P</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.0.1</string>
+	<key>CFBundleSignature</key>
+	<string>i2p</string>
+	<key>CFBundleVersion</key>
+	<string>0.0.1</string>
+	<key>NSAppleScriptEnabled</key>
+	<true/>
+	<key>CGDisableCoalescedUpdates</key>
+	<true/>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.5</string>
+	<key>CFBundleDisplayName</key>
+	<string>Start I2P Router</string>
+	<key>LSMinimumSystemVersionByArchitecture</key>
+	<dict>
+		<key>i386</key>
+		<string>10.5.0</string>
+		<key>x86_64</key>
+		<string>10.6.0</string>
+	</dict>
+</dict>
+</plist>
diff --git a/installer/resources/Start I2P Router.app/Contents/MacOS/i2prouter b/installer/resources/Start I2P Router.app/Contents/MacOS/i2prouter
new file mode 100755
index 0000000000..6c0ac832ea
--- /dev/null
+++ b/installer/resources/Start I2P Router.app/Contents/MacOS/i2prouter	
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+
+%INSTALL_PATH/i2prouter start
diff --git a/installer/resources/Start I2P Router.app/Contents/Resources/i2p.icns b/installer/resources/Start I2P Router.app/Contents/Resources/i2p.icns
new file mode 100644
index 0000000000..c4fbd1fa43
Binary files /dev/null and b/installer/resources/Start I2P Router.app/Contents/Resources/i2p.icns differ
diff --git a/installer/resources/postinstall.sh b/installer/resources/postinstall.sh
index 9e9216063c..c0abd50c9a 100644
--- a/installer/resources/postinstall.sh
+++ b/installer/resources/postinstall.sh
@@ -67,6 +67,7 @@ case $HOST_OS in
     osx )
         wrapperpath="./lib/wrapper/macosx"
         cp ${wrapperpath}/libwrapper.jnilib ./lib/
+	chmod 755 ./Start\ I2P\ Router.app/Contents/MacOS/i2prouter
         ;;
     solaris )
         wrapperpath="./lib/wrapper/solaris"
@@ -90,6 +91,12 @@ rm -f ./lib/*.dll
 rm -f ./*.bat
 rm -f ./*.exe
 rm -rf ./installer
+
+if [ ! `echo $HOST_OS  |grep osx` ]; then
+    rm -rf ./Start\ I2P\ Router.app
+    #rm -f I2P\ Router\ Console.webloc
+fi
+
 # no, let's not start the router from the install script any more
 # ./i2prouter start
 exit 0
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 0cd02d33d1..5fd579e05b 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 29;
+    public final static long BUILD = 30;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";