diff --git a/stepmania/PBProject/Info-StepMania.plist b/stepmania/PBProject/Info-StepMania.plist
index d5e774fc53..b883ceaf8f 100644
--- a/stepmania/PBProject/Info-StepMania.plist
+++ b/stepmania/PBProject/Info-StepMania.plist
@@ -7,23 +7,23 @@
 	<key>CFBundleExecutable</key>
 	<string>StepMania</string>
 	<key>CFBundleGetInfoString</key>
-	<string>StepMania 4.0 CVS</string>
+	<string>PRODUCT_NAME_BARE PRODUCT_VER_BARE</string>
 	<key>CFBundleIconFile</key>
 	<string>smicon.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>StepMania</string>
+	<string>PRODUCT_NAME_BARE</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>StepMania</string>
+	<string>PRODUCT_NAME_BARE</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0 CVS</string>
+	<string>PRODUCT_VER</string>
 	<key>CFBundleSignature</key>
 	<string>Step</string>
 	<key>CFBundleVersion</key>
-	<string>4.0</string>
+	<string>PRODUCT_VER_BARE</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.2.8</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/stepmania/PBProject/stepmania.pbproj/project.pbxproj b/stepmania/PBProject/stepmania.pbproj/project.pbxproj
index 4a9757e67b..89eb0828ef 100755
--- a/stepmania/PBProject/stepmania.pbproj/project.pbxproj
+++ b/stepmania/PBProject/stepmania.pbproj/project.pbxproj
@@ -4235,6 +4235,8 @@
 					"$(SDKROOT)/usr/include",
 				);
 				INFOPLIST_FILE = "Info-StepMania.plist";
+				INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/../src/ProductInfo.h";
+				INFOPLIST_PREPROCESS = YES;
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = (
 					"$(SDKROOT)/usr/lib",
@@ -4376,6 +4378,8 @@
 					"$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/A/Headers",
 				);
 				INFOPLIST_FILE = "Info-StepMania.plist";
+				INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/../src/ProductInfo.h";
+				INFOPLIST_PREPROCESS = YES;
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = (
 					/usr/lib,
diff --git a/stepmania/src/ProductInfo.h b/stepmania/src/ProductInfo.h
index 69236f5a37..e537abbf9b 100644
--- a/stepmania/src/ProductInfo.h
+++ b/stepmania/src/ProductInfo.h
@@ -5,9 +5,17 @@
 
 // Don't forget to also change ProductInfo.inc!
 
-#define PRODUCT_NAME "StepMania"
-#define PRODUCT_VER "4.0 CVS"
-//#define PRODUCT_VER "4.0 alpha 1"
+// Change these two
+#define PRODUCT_NAME_BARE StepMania
+#define PRODUCT_VER_BARE 4.0 CVS
+//#define PRODUCT_VER_BARE 4.0 alpha 1
+
+// These cannot be #undef'd so make them unlikely to conflict with anything
+#define PRODUCT_STRINGIFY(x) #x
+#define PRODUCT_XSTRINGIFY(x) PRODUCT_STRINGIFY(x)
+
+#define PRODUCT_NAME PRODUCT_XSTRINGIFY(PRODUCT_NAME_BARE)
+#define PRODUCT_VER PRODUCT_XSTRINGIFY(PRODUCT_VER_BARE)
 #define PRODUCT_NAME_VER PRODUCT_NAME " " PRODUCT_VER
 
 #define VIDEO_TROUBLESHOOTING_URL "http://www.stepmania.com/stepmania/mediawiki.php?title=Video_Driver_Troubleshooting"