1diff --git a/libnemo-private/nemo-module.c b/libnemo-private/nemo-module.c
2index 92bcff5..ecadcd8 100644
3--- a/libnemo-private/nemo-module.c
4+++ b/libnemo-private/nemo-module.c
5@@ -209,11 +209,16 @@ void
6 nemo_module_setup (void)
7 {
8 static gboolean initialized = FALSE;
9+ const gchar *extensiondir = NULL;
10
11 if (!initialized) {
12 initialized = TRUE;
13
14- load_module_dir (NEMO_EXTENSIONDIR);
15+ extensiondir = g_getenv ("NEMO_EXTENSION_DIR");
16+ if (extensiondir == NULL) {
17+ extensiondir = NEMO_EXTENSIONDIR;
18+ }
19+ load_module_dir (extensiondir);
20
21 eel_debug_call_at_shutdown (free_module_objects);
22 }
23diff --git a/src/nemo-extensions-list.c b/src/nemo-extensions-list.c
24index 944fc5f..983c396 100644
25--- a/src/nemo-extensions-list.c
26+++ b/src/nemo-extensions-list.c
27@@ -129,7 +129,12 @@ module_get_extensions_for_type (GType type)
28 int
29 main (int argc, char *argv[])
30 {
31- populate_from_directory (NEMO_EXTENSIONDIR);
32+ const gchar *extensiondir = NULL;
33+ extensiondir = g_getenv ("NEMO_EXTENSION_DIR");
34+ if (extensiondir == NULL) {
35+ extensiondir = NEMO_EXTENSIONDIR;
36+ }
37+ populate_from_directory (extensiondir);
38
39 GList *nd_providers;
40 GList *l;