diff --git a/cmake/backbone b/cmake/backbone
index 02f3a0f..53f0f09 160000
--- a/cmake/backbone
+++ b/cmake/backbone
@@ -1 +1 @@
-Subproject commit 02f3a0f7d969534872799b45a95d3c5a6fef14c3
+Subproject commit 53f0f093c4f1332154d792891ef645d036473302
diff --git a/src/GLib.Settings.vala b/src/GLib.Settings.vala
index 87f13cb..b56feae 100644
--- a/src/GLib.Settings.vala
+++ b/src/GLib.Settings.vala
@@ -5,6 +5,9 @@ public static int main (string[] args) {
 		// Custom location:
 		File exec_file = File.new_for_path (Environment.find_program_in_path (args[0]));
 		string settings_dir = Path.build_path (Path.DIR_SEPARATOR_S, exec_file.get_parent().get_parent().get_path(), "share/glib-2.0/schemas");
+		string w32dhack_sdir = settings_dir+"/gschema-test-"+Config.VERSION_MAJOR.to_string();
+		if (File.new_for_path(w32dhack_sdir+"/gschemas.compiled").query_exists ())
+			settings_dir = w32dhack_sdir;
 
 		// l18n location:
 		string localedir = Path.build_path (Path.DIR_SEPARATOR_S, exec_file.get_parent().get_parent().get_path(), "share/locale");