diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index b635ba50b4..9005b94444 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -201,18 +201,6 @@ fixup_bundle_environment (int, char* [])
 
 	setenv ("VAMP_PATH", path.c_str(), 1);
 
-	cstr = getenv ("ARDOUR_CONTROL_SURFACE_PATH");
-	if (cstr) {
-		path = cstr;
-		path += ':';
-	} else {
-		path = "";
-	}
-	path += dir_path;
-	path += "/../Surfaces";
-
-	setenv ("ARDOUR_CONTROL_SURFACE_PATH", path.c_str(), 1);
-
 	cstr = getenv ("ARDOUR_PANNER_PATH");
 	if (cstr) {
 		path = cstr;
@@ -237,6 +225,18 @@ fixup_bundle_environment (int, char* [])
 	
 	setenv ("ARDOUR_SURFACES_PATH", path.c_str(), 1);
 
+	cstr = getenv ("ARDOUR_MIDIMAPS_PATH");
+	if (cstr) {
+		path = cstr;
+		path += ':';
+	} else {
+		path = "";
+	}
+	path += dir_path;
+	path += "/share/midimaps";
+	
+	setenv ("ARDOUR_MIDIMAPS_PATH", path.c_str(), 1);
+
 	path = dir_path;
 	path += "/../Frameworks/clearlooks";
 
@@ -399,18 +399,6 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
 	
 	setenv ("VAMP_PATH", path.c_str(), 1);
 
-	cstr = getenv ("ARDOUR_CONTROL_SURFACE_PATH");
-	if (cstr) {
-		path = cstr;
-		path += ':';
-	} else {
-		path = "";
-	}
-	path += dir_path;
-	path += "/lib/surfaces";
-	
-	setenv ("ARDOUR_CONTROL_SURFACE_PATH", path.c_str(), 1);
-
 	cstr = getenv ("ARDOUR_PANNER_PATH");
 	if (cstr) {
 		path = cstr;
@@ -435,6 +423,18 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
 	
 	setenv ("ARDOUR_SURFACES_PATH", path.c_str(), 1);
 
+	cstr = getenv ("ARDOUR_MIDIMAPS_PATH");
+	if (cstr) {
+		path = cstr;
+		path += ':';
+	} else {
+		path = "";
+	}
+	path += dir_path;
+	path += "/share/midimaps";
+	
+	setenv ("ARDOUR_MIDIMAPS_PATH", path.c_str(), 1);
+
 	path = dir_path;
 	path += "/lib/clearlooks";