diff --git a/stepmania/PBProject/Info-StepMania.plist b/stepmania/PBProject/Info-StepMania.plist
index 8ae6e234f8..f8f2295369 100644
--- a/stepmania/PBProject/Info-StepMania.plist
+++ b/stepmania/PBProject/Info-StepMania.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>StepMania</string>
 	<key>CFBundleGetInfoString</key>
-	<string>StepMania 3.9 alpha 22</string>
+	<string>StepMania 3.9 alpha 23</string>
 	<key>CFBundleIconFile</key>
 	<string>smicon.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.9 alpha 22</string>
+	<string>3.9 alpha 23</string>
 	<key>CFBundleSignature</key>
 	<string>Step</string>
 	<key>CFBundleVersion</key>
-	<string>3.9a22</string>
+	<string>3.9a23</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.2.8</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/stepmania/PBProject/Libraries/Libraries.xcode/project.pbxproj b/stepmania/PBProject/Libraries/Libraries.xcode/project.pbxproj
index 4f8c6dda1a..aa2c395308 100644
--- a/stepmania/PBProject/Libraries/Libraries.xcode/project.pbxproj
+++ b/stepmania/PBProject/Libraries/Libraries.xcode/project.pbxproj
@@ -3028,7 +3028,7 @@
 				AA4B41C005733991005FB5DB,
 			);
 			isa = PBXGroup;
-			name = png;
+			path = "libpng-1.2.7";
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3036,8 +3036,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = png.c;
-			path = "libpng-1.2.5/png.c";
+			path = png.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3045,8 +3044,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.h;
-			name = png.h;
-			path = "libpng-1.2.5/png.h";
+			path = png.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3054,8 +3052,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.h;
-			name = pngconf.h;
-			path = "libpng-1.2.5/pngconf.h";
+			path = pngconf.h;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3063,8 +3060,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = pngerror.c;
-			path = "libpng-1.2.5/pngerror.c";
+			path = pngerror.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3072,8 +3068,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = pngget.c;
-			path = "libpng-1.2.5/pngget.c";
+			path = pngget.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3081,8 +3076,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = pngmem.c;
-			path = "libpng-1.2.5/pngmem.c";
+			path = pngmem.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3090,8 +3084,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = pngpread.c;
-			path = "libpng-1.2.5/pngpread.c";
+			path = pngpread.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3099,8 +3092,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = pngread.c;
-			path = "libpng-1.2.5/pngread.c";
+			path = pngread.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3108,8 +3100,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = pngrio.c;
-			path = "libpng-1.2.5/pngrio.c";
+			path = pngrio.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3117,8 +3108,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = pngrtran.c;
-			path = "libpng-1.2.5/pngrtran.c";
+			path = pngrtran.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3126,8 +3116,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = pngrutil.c;
-			path = "libpng-1.2.5/pngrutil.c";
+			path = pngrutil.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3135,8 +3124,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = pngset.c;
-			path = "libpng-1.2.5/pngset.c";
+			path = pngset.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3144,8 +3132,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = pngtrans.c;
-			path = "libpng-1.2.5/pngtrans.c";
+			path = pngtrans.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3153,8 +3140,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = pngwio.c;
-			path = "libpng-1.2.5/pngwio.c";
+			path = pngwio.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3162,8 +3148,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = pngwrite.c;
-			path = "libpng-1.2.5/pngwrite.c";
+			path = pngwrite.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3171,8 +3156,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = pngwtran.c;
-			path = "libpng-1.2.5/pngwtran.c";
+			path = pngwtran.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -3180,8 +3164,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.c.c;
-			name = pngwutil.c;
-			path = "libpng-1.2.5/pngwutil.c";
+			path = pngwutil.c;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -10585,7 +10568,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = ./make_links.sh;
+			shellScript = "./make_links.sh\nfor i in build/*.framework/Versions/Current; do\n\tif [ -f $i ]; then\n\t\tstrip -x $i\n\tfi\ndone";
 		};
 		AADD868D05834B5600F14F0E = {
 			fileEncoding = 30;
diff --git a/stepmania/PBProject/Libraries/librarylist b/stepmania/PBProject/Libraries/librarylist
index 5a904423b4..31a76a419b 100644
--- a/stepmania/PBProject/Libraries/librarylist
+++ b/stepmania/PBProject/Libraries/librarylist
@@ -3,7 +3,7 @@ ffmpeg-0.4.9-pre1
 jpeg-6b
 libmad-0.1.5.1b
 libogg-1.1
-libpng-1.2.5
+libpng-1.2.7
 libvorbis-1.0.1
 lua-5.0
 
diff --git a/stepmania/PBProject/stepmania.pbproj/project.pbxproj b/stepmania/PBProject/stepmania.pbproj/project.pbxproj
index 84669e6c7e..00b30ca8a8 100755
--- a/stepmania/PBProject/stepmania.pbproj/project.pbxproj
+++ b/stepmania/PBProject/stepmania.pbproj/project.pbxproj
@@ -2389,6 +2389,7 @@
 				AA8A405206EEFF72002F25AB,
 				AA54709206F559DF008EB9B2,
 				AA21D5A20712AE16008B825F,
+				AAFC6CF2072A30440053AAD3,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4300,6 +4301,7 @@
 				AA8A3E6406EDCD11002F25AB,
 				AA8A405106EEFF72002F25AB,
 				AA21D59D0712ADE4008B825F,
+				AAFC6CF1072A30440053AAD3,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -8877,6 +8879,8 @@
 		};
 		AA6E01540477136A005F316C = {
 			children = (
+				AAFC6CEF072A30440053AAD3,
+				AAFC6CF0072A30440053AAD3,
 				AAB3B36B04C38B4600D02EE9,
 				AAB3B36C04C38B4600D02EE9,
 				AA69675106840991007802A5,
@@ -16489,6 +16493,34 @@
 			settings = {
 			};
 		};
+		AAFC6CEF072A30440053AAD3 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = InputHandler_MonkeyKeyboard.cpp;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AAFC6CF0072A30440053AAD3 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = InputHandler_MonkeyKeyboard.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AAFC6CF1072A30440053AAD3 = {
+			fileRef = AAFC6CEF072A30440053AAD3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		AAFC6CF2072A30440053AAD3 = {
+			fileRef = AAFC6CF0072A30440053AAD3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		AAFC7FF00513A67700D02EE9 = {
 			explicitFileType = sourcecode.cpp;
 			fileEncoding = 30;