diff --git a/build_tools/fish_shell.pmdoc/01fish-contents.xml b/build_tools/fish_shell.pmdoc/01fish-contents.xml
deleted file mode 100644
index bc1e5a791..000000000
--- a/build_tools/fish_shell.pmdoc/01fish-contents.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkg-contents spec="1.12"/>
\ No newline at end of file
diff --git a/build_tools/fish_shell.pmdoc/01fish.xml b/build_tools/fish_shell.pmdoc/01fish.xml
deleted file mode 100644
index efe170e16..000000000
--- a/build_tools/fish_shell.pmdoc/01fish.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="6A7E1ED5-E40E-4ACE-959B-B9D77555AD39"><config><identifier>com.ridiculousfish.fish-shell.fishShell.fish_pkg.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom>/private/tmp/fish_pkg</installFrom><installTo>/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>installTo</mod></config></pkgref>
\ No newline at end of file
diff --git a/build_tools/fish_shell.pmdoc/index.xml b/build_tools/fish_shell.pmdoc/index.xml
deleted file mode 100644
index 0da74990a..000000000
--- a/build_tools/fish_shell.pmdoc/index.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<pkmkdoc spec="1.12"><properties><title>fish shell</title><organization>com.ridiculousfish.fish-shell</organization><userSees ui="easy"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="fish_pkg" id="fish shell" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.ridiculousfish.fish-shell.fishShell.fish_pkg.pkg"/></choice></contents><resources bg-scale="proportional" bg-align="bottomleft"><locale lang="en"><resource mod="true" type="background">/Users/peter/Desktop/Untitled.pdf</resource><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf470
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
-
-\f0\fs30 \cf0 This installs ridiculous_fish's fork of fish, a command line shell for Mac OS X, Linux, and the rest of the family. For more information on fish, visit {\field{\*\fldinst{HYPERLINK "http://ridiculousfish.com/shell/"}}{\fldrslt http://ridiculousfish.com/shell/}}\
-\
-The path to fish will be added to /etc/shells, but your default shell will not be modified. \
-\
-This release is beta r2.\
-}]]></resource><resource mime-type="text/rtf" kind="embedded" type="conclusion"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf470
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Monaco;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
-
-\f0\fs26 \cf0 Run
-\f1 fish
-\f0  at the command line to start it up!  Some useful commands:\
-\
-Interactively set your colors from a web page:\
-\
-
-\f1 fish_config
-\f0 \
-\
-Update man-page completions:\
-\
-
-\f1 fish_update_completions
-\f0 \
-\
-Make fish your default shell:\
-\
-
-\f1 chsh -s /usr/local/bin/fish\
-
-\f0 \
-\
-Enjoy!\
-}]]></resource></locale></resources><flags/><item type="file">01fish.xml</item><mod>properties.title</mod><mod>description</mod></pkmkdoc>
\ No newline at end of file
diff --git a/build_tools/make_pkg.sh b/build_tools/make_pkg.sh
index 3486c2b79..1c4f70eea 100755
--- a/build_tools/make_pkg.sh
+++ b/build_tools/make_pkg.sh
@@ -1,31 +1,10 @@
 #!/bin/sh -x
 
 make distclean
-rm -rf /tmp/fish_pkg
-mkdir -p /tmp/fish_pkg/
+rm -Rf /tmp/fish_pkg
+mkdir -p /tmp/fish_pkg/root /tmp/fish_pkg/intermediates /tmp/fish_pkg/dst
 
-# Make sure what we build can run on SnowLeopard
-export OSX_SDK="/Developer/SDKs/MacOSX10.6.sdk"
-export MACOSX_DEPLOYMENT_TARGET="10.6"
-export CC="clang -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
-export CCX="clang++ -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
-export CFLAGS="$CFLAGS -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
-export CXXFLAGS="$CXXFLAGS -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
-export LDFLAGS="$LDFLAGS -isysroot $OSX_SDK -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
-autoconf
-./configure
+xcodebuild install -scheme install_tree -configuration Release DSTROOT=/tmp/fish_pkg/root/
+pkgbuild --scripts build_tools/osx_package_scripts --root /tmp/fish_pkg/root/ --identifier 'com.ridiculousfish.fish-shell-pkg' /tmp/fish_pkg/intermediates/fish.pkg
 
-# Actually build it now
-if make -j 4 DESTDIR=/tmp/fish_pkg install
-then
-	echo "Root written to /tmp/fish_pkg/"
-	if /Developer/usr/bin/packagemaker --doc ./build_tools/fish_shell.pmdoc --out ~/fish_built/fishfish.pkg
-	then
-		echo "Package written to ~/fish_built/fishfish.pkg"
-	else
-		echo "Package could not be written"
-	fi
-	
-else
-	echo "Root could not be written"
-fi
+productbuild  --package-path /tmp/fish_pkg/intermediates --distribution build_tools/osx_distribution.xml --resources build_tools/osx_package_resources/ ~/fish_built/fish.pkg
diff --git a/build_tools/osx_distribution.xml b/build_tools/osx_distribution.xml
new file mode 100644
index 000000000..1c42fecb9
--- /dev/null
+++ b/build_tools/osx_distribution.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<installer-gui-script minSpecVersion="1">
+    <title>fish shell</title>
+    <welcome file="welcome.rtf"/>
+    <background file="terminal_logo.png" scaling="proportional" alignment="bottomleft"/>
+    <pkg-ref id="com.ridiculousfish.fish-shell-pkg"/>
+    <options customize="never" require-scripts="false"/>
+    <choices-outline>
+        <line choice="default">
+            <line choice="com.ridiculousfish.fish-shell-pkg"/>
+        </line>
+    </choices-outline>
+    <choice id="default"/>
+    <choice id="com.ridiculousfish.fish-shell-pkg" visible="false">
+        <pkg-ref id="com.ridiculousfish.fish-shell-pkg"/>
+    </choice>
+    <pkg-ref id="com.ridiculousfish.fish-shell-pkg" version="0" onConclusion="none">fish.pkg</pkg-ref>
+</installer-gui-script>
diff --git a/build_tools/osx_package_resources/terminal_logo.png b/build_tools/osx_package_resources/terminal_logo.png
new file mode 100644
index 000000000..68261d51e
Binary files /dev/null and b/build_tools/osx_package_resources/terminal_logo.png differ
diff --git a/build_tools/osx_package_resources/welcome.rtf b/build_tools/osx_package_resources/welcome.rtf
new file mode 100644
index 000000000..8dca739e6
--- /dev/null
+++ b/build_tools/osx_package_resources/welcome.rtf
@@ -0,0 +1,25 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Monaco;}
+{\colortbl;\red255\green255\blue255;}
+{\info
+{\author dlkfjslfjsfdlkfk}}\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
+
+\f0\fs30 \cf0 The fish shell is a smart and user friendly command line shell. For more information on fish, visit {\field{\*\fldinst{HYPERLINK "http://fishshell.com"}}{\fldrslt http://fishshell.com}}.\
+\
+fish will be installed into
+\f1\fs26 /usr/local/
+\f0\fs30 , and fish will be added to
+\f1\fs26 /etc/shells
+\f0\fs30  if necessary.\
+\
+Your default shell will
+\i not
+\i0  be changed. To make fish your default, run:\
+\
+
+\f1 chsh -s /usr/local/bin/fish
+\f0 \
+\
+Enjoy!\
+}
\ No newline at end of file