diff --git a/processing/app/buzz.pl b/processing/app/buzz.pl
index 7ab31e899..421c87cc8 100644
--- a/processing/app/buzz.pl
+++ b/processing/app/buzz.pl
@@ -124,7 +124,7 @@ foreach $arg (@ARGV) {
 		#print "creating dir $temp_dir$separator$dir\n";
 		mkdirs("$temp_dir$separator$dir", 0777) || die "$temp_dir$separator$dir $!";
 	    }
-	    opendir(DIR, $dir) || die $!;
+	    opendir(DIR, $dir) || die "$! for $dir";
 	    @dcontents = readdir(DIR);
 	    closedir(DIR);
 	    foreach $file (@dcontents) {
diff --git a/processing/build/macosx/.cvsignore b/processing/build/macosx/.cvsignore
new file mode 100644
index 000000000..b8f99f5be
--- /dev/null
+++ b/processing/build/macosx/.cvsignore
@@ -0,0 +1 @@
+work
diff --git a/processing/build/macosx/make.sh b/processing/build/macosx/make.sh
index e110766a4..4bdc0be6a 100755
--- a/processing/build/macosx/make.sh
+++ b/processing/build/macosx/make.sh
@@ -6,7 +6,7 @@
 if test -d work
 then
 else
-  echo Setting up directories to build P5 on windows...
+  echo Setting up directories to build P5 under Mac OS X
   mkdir work
 #  unzip -q -d work jre.zip
   cp -r ../shared/lib work/
@@ -28,14 +28,21 @@ fi
 cd ../..
 
 
-#PLATFORM_CLASSPATH=java/lib/rt.jar:java/lib/ext/comm.jar
-
-
 ### -- BUILD BAGEL ----------------------------------------------
 cd ..
+# make sure bagel exists, if not, check it out of cvs
+if test -d bagel
+then 
+else
+  echo Doing CVS checkout of bagel...
+  cvs co bagel
+  cd bagel
+  cvs update -P
+  cd ..
+fi
 cd bagel
 
-MACOSX_CLASSPATH=poo
+MACOSX_CLASSPATH=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Home/lib/ext/comm.jar
 
 CLASSPATH=$MACOSX_CLASSPATH
 
@@ -59,9 +66,9 @@ echo Building PDE for JDK 1.3
 
 CLASSPATH=build/macosx/work/classes:build/macosx/work/lib/kjc.jar:build/macosx/work/lib/oro.jar:$MACOSX_CLASSPATH
 
-perl buzz.pl "jikes +D -classpath $CLASSPATH -d build/windows/work/classes" -dJDK13 *.java kjc/*.java 
+perl buzz.pl "jikes +D -classpath $CLASSPATH -d build/macosx/work/classes" -dJDK13 *.java
 
-cd build/windows/work/classes
+cd build/macosx/work/classes
 rm -f ../lib/pde.jar
 zip -0q ../lib/pde.jar *.class
 cd ../..
diff --git a/processing/build/windows/make.sh b/processing/build/windows/make.sh
index ce744e749..064162338 100755
--- a/processing/build/windows/make.sh
+++ b/processing/build/windows/make.sh
@@ -33,6 +33,16 @@ cd ../..
 
 ### -- BUILD BAGEL ----------------------------------------------
 cd ..
+# make sure bagel exists, if not, check it out of cvs
+if test -d bagel
+then 
+else
+  echo Doing CVS checkout of bagel...
+  cvs co bagel
+  cd bagel
+  cvs update -P
+  cd ..
+fi
 cd bagel
 
 CLASSPATH=../app/build/windows/work/java/lib/rt.jar:../app/build/windows/work/java/lib/ext/comm.jar
@@ -58,7 +68,7 @@ echo Building PDE for JDK 1.3
 
 CLASSPATH=build/windows/work/classes:build/windows/work/lib/kjc.jar:build/windows/work/lib/oro.jar:build/windows/work/java/lib/rt.jar:build/windows/work/java/lib/ext/comm.jar
 
-perl buzz.pl "jikes +D -classpath $CLASSPATH -d build/windows/work/classes" -dJDK13 *.java kjc/*.java 
+perl buzz.pl "jikes +D -classpath $CLASSPATH -d build/windows/work/classes" -dJDK13 *.java 
 
 cd build/windows/work/classes
 rm -f ../lib/pde.jar