2 files changed, 5 insertions, 1 deletions
diff --git a/src/world.c b/src/world.c
index 39262e6..5493cba 100644
--- a/src/world.c
+++ b/src/world.c
@@ -514,6 +514,10 @@ expand(const char* path)
 	}
 
 	wordfree(&p);
+#elif defined(__WIN32__)
+	static const size_t len = 32767;
+	char*               ret = malloc(len);
+	ExpandEnvironmentStrings(path, ret, len);
 #else
 	char* ret = slv2_strdup(path);
 #endif
diff --git a/wscript b/wscript
index a39eeb9..e3678c2 100644
--- a/wscript
+++ b/wscript
@@ -133,7 +133,7 @@ def configure(conf):
                     '~/.lv2',
                     '/boot/common/add-ons/lv2'])
         elif Options.platform == 'win32':
-            Options.options.default_lv2_path = 'C:\\\\Program Files\\\\LV2'
+            Options.options.default_lv2_path = '%APPDATA%\\\\LV2;%PROGRAMFILES%\\\\LV2'
         else:
             libdirname = os.path.basename(conf.env['LIBDIR'])
             Options.options.default_lv2_path = slv2_path_sep.join([