diff --git a/build/linux/dist/librxtxSerial.so b/build/linux/dist/librxtxSerial.so
index bcba4ad71..e60c5e674 100644
Binary files a/build/linux/dist/librxtxSerial.so and b/build/linux/dist/librxtxSerial.so differ
diff --git a/build/macosx/Arduino.xcodeproj/project.pbxproj b/build/macosx/Arduino.xcodeproj/project.pbxproj
index bb28e79a1..4fc576493 100644
--- a/build/macosx/Arduino.xcodeproj/project.pbxproj
+++ b/build/macosx/Arduino.xcodeproj/project.pbxproj
@@ -410,7 +410,6 @@
 		33FF02860965BD160016AC38 /* tab-unsel-menu.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "tab-unsel-menu.gif"; sourceTree = "<group>"; };
 		33FF02870965BD160016AC38 /* tab-unsel-mid.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "tab-unsel-mid.gif"; sourceTree = "<group>"; };
 		33FF02880965BD160016AC38 /* tab-unsel-right.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = "tab-unsel-right.gif"; sourceTree = "<group>"; };
-		33FF028B0965BD160016AC38 /* run.bat */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = run.bat; sourceTree = "<group>"; };
 		33FF02900965BD160016AC38 /* .cvsignore */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = .cvsignore; sourceTree = "<group>"; };
 		33FF02920965BD160016AC38 /* avr_tools.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = avr_tools.zip; sourceTree = "<group>"; };
 		33FF02940965BD160016AC38 /* burn.bat */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = burn.bat; sourceTree = "<group>"; };
@@ -422,7 +421,6 @@
 		33FF029C0965BD160016AC38 /* jikes.exe */ = {isa = PBXFileReference; lastKnownFileType = file; path = jikes.exe; sourceTree = "<group>"; };
 		33FF029E0965BD170016AC38 /* makefile.w2k */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = makefile.w2k; sourceTree = "<group>"; };
 		33FF029F0965BD170016AC38 /* makefile.win */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = makefile.win; sourceTree = "<group>"; };
-		33FF02A00965BD170016AC38 /* run-expert.bat */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "run-expert.bat"; sourceTree = "<group>"; };
 		33FF02A10965BD170016AC38 /* run.bat */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = run.bat; sourceTree = "<group>"; };
 		33FF02A20965BD170016AC38 /* rxtxSerial.dll */ = {isa = PBXFileReference; lastKnownFileType = file; path = rxtxSerial.dll; sourceTree = "<group>"; };
 		33FF02A40965BD170016AC38 /* dist.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = dist.sh; sourceTree = "<group>"; };
@@ -563,8 +561,6 @@
 			children = (
 				33FF01DB0965BD160016AC38 /* dist */,
 				33FF01DD0965BD160016AC38 /* lib */,
-				33FF02890965BD160016AC38 /* reference */,
-				33FF028B0965BD160016AC38 /* run.bat */,
 				33FF028C0965BD160016AC38 /* sketchbook */,
 			);
 			path = shared;
@@ -607,21 +603,6 @@
 			path = lib;
 			sourceTree = "<group>";
 		};
-		33FF02890965BD160016AC38 /* reference */ = {
-			isa = PBXGroup;
-			children = (
-				33FF028A0965BD160016AC38 /* images */,
-			);
-			path = reference;
-			sourceTree = "<group>";
-		};
-		33FF028A0965BD160016AC38 /* images */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = images;
-			sourceTree = "<group>";
-		};
 		33FF028C0965BD160016AC38 /* sketchbook */ = {
 			isa = PBXGroup;
 			children = (
@@ -670,7 +651,6 @@
 				33FF029B0965BD160016AC38 /* ICE_JNIRegistry.dll */,
 				33FF029C0965BD160016AC38 /* jikes.exe */,
 				33FF029D0965BD160016AC38 /* lib */,
-				33FF02A00965BD170016AC38 /* run-expert.bat */,
 				33FF02A10965BD170016AC38 /* run.bat */,
 				33FF02A20965BD170016AC38 /* rxtxSerial.dll */,
 				33FF02A30965BD170016AC38 /* serial */,
diff --git a/build/macosx/dist/librxtxSerial.jnilib b/build/macosx/dist/librxtxSerial.jnilib
index 83fdef9c7..2d3f20d6d 100644
Binary files a/build/macosx/dist/librxtxSerial.jnilib and b/build/macosx/dist/librxtxSerial.jnilib differ
diff --git a/build/macosx/dist/macosx_setup.command b/build/macosx/dist/macosx_setup.command
index b5d93eba7..f6d9c9b4d 100755
--- a/build/macosx/dist/macosx_setup.command
+++ b/build/macosx/dist/macosx_setup.command
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# modified to change from /var/spool/uucp to /var/lock for rxtx 2.1_7r2
+# for processing release 0112, 13 april 2006 [fry]
+
 # originally fixperm.sh from rxtx-2.1_6/contrib
 # with a couple additions from pathsetup.command from fink [fry]
 
@@ -24,13 +27,13 @@ answer=`echo $answer | sed 's/^[yY].*$/y/'`
 if [ -z "$answer" -o "x$answer" = "xy" ]; then
     curruser=`sudo id -p | grep 'login' | sed 's/login.//'`
 
-    if [ ! -d /var/spool/uucp ]
+    if [ ! -d /var/lock ]
     then
-        sudo mkdir /var/spool/uucp
+        sudo mkdir /var/lock
     fi
 
-    sudo chgrp uucp /var/spool/uucp
-    sudo chmod 775 /var/spool/uucp
+    sudo chgrp uucp /var/lock
+    sudo chmod 775 /var/lock
 
     if [ ! `sudo niutil -readprop / /groups/uucp users | grep $curruser > /dev/null` ]
     then
diff --git a/build/shared/lib/RXTXcomm.jar b/build/shared/lib/RXTXcomm.jar
index 427347680..84e5f01df 100644
Binary files a/build/shared/lib/RXTXcomm.jar and b/build/shared/lib/RXTXcomm.jar differ
diff --git a/build/windows/dist/rxtxSerial.dll b/build/windows/dist/rxtxSerial.dll
index 96e4f5dec..c0e6b5822 100644
Binary files a/build/windows/dist/rxtxSerial.dll and b/build/windows/dist/rxtxSerial.dll differ