diff --git a/build/macosx/dist.sh b/build/macosx/dist.sh
index 35b341f73..69f998333 100755
--- a/build/macosx/dist.sh
+++ b/build/macosx/dist.sh
@@ -6,23 +6,23 @@ REVISION=`head -1 ../../todo.txt | awk '{print $1}'`
 if [ $1 ]
 then
   RELEASE=$1
-  echo Creating Processing release $RELEASE...
+  echo Creating Arduino release $RELEASE...
 else 
   RELEASE=$REVISION
-  echo Creating Processing distribution for revision $REVISION...
+  echo Creating Arduino distribution for revision $REVISION...
 fi
 
 VERSIONED=`cat ../../app/src/processing/app/Base.java | grep $REVISION`
 if [ -z "$VERSIONED" ]
 then
-  echo Fix the revision number in Base.java
+  echo Fix the revision number in Base.java or todo.txt
   exit
 fi
 
 # remove any unfinished builds or old builds
-rm -rf processing
-rm -rf Processing*
-rm -rf processing-*
+rm -rf arduino
+rm -rf Arduino*
+rm -rf arduino-*
 rm -rf work
 
 ./make.sh
@@ -30,7 +30,7 @@ rm -rf work
 if [ $1 ]
 then
   # write the release version number into the output directory
-  echo $1 > work/Processing.app/Contents/Resources/Java/lib/version.txt
+  echo $1 > work/Arduino.app/Contents/Resources/Java/lib/version.txt
 fi
 
 echo Cleaning file boogers...
@@ -54,8 +54,8 @@ find work -name ".svn" -exec rm -rf {} 2> /dev/null ';'
 echo Creating disk image...
 
 SOURCE_DIR="work"
-SOURCE_FILES="Processing.app"
-OUTPUT_DMG="processing-$RELEASE"
+SOURCE_FILES="Arduino.app"
+OUTPUT_DMG="arduino-$RELEASE"
 WORK_DMG="working.dmg"
 WORK_DIR="working_dir"
 
diff --git a/build/macosx/template.dmg.gz b/build/macosx/template.dmg.gz
index 5c4fe0dfc..9d123fa62 100644
Binary files a/build/macosx/template.dmg.gz and b/build/macosx/template.dmg.gz differ
diff --git a/todo.txt b/todo.txt
index ec7a52479..713753c98 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,4 +1,4 @@
-0016 arduino
+0017 arduino
 
 
 PROCESSING 5503 SYNC
@@ -65,6 +65,8 @@ Preferences.java
 
 AVR
 
+Servo library:
+ - patch for the Mega (pins 11 and 12, not 9 and 10)
 Ethernet library:
  - integrate DHCP support
  - client.connect() returns 0 when connection is successful?  http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1238295170