diff --git a/bin/cdist b/bin/cdist
index fb09e8b2..5cabf17b 100755
--- a/bin/cdist
+++ b/bin/cdist
@@ -63,17 +63,24 @@ def base_directory():
    os.chdir(os.path.join(os.path.dirname(__file__), os.pardir))
    return os.getcwd()
 
+def remote_base_directory():
+   return "/var/lib/cdist"
+
 def conf_directory():
    """Returns path to main configuration directory"""
    return os.path.join(base_directory(), "conf")
 
+def remote_conf_directory():
+   """Returns path to remote main configuration directory"""
+   return os.path.join(remote_base_directory(), "conf")
+
 def global_explorer_directory():
    """Returns path to directory containing the global explorers"""
    return os.path.join(conf_directory(), "explorer")
 
 def remote_global_explorer_directory():
-   """Returns path to directory containing the global explorers"""
-   return os.path.join(conf_directory(), "explorer")
+   """Returns path to the remote directory containing the global explorers"""
+   return os.path.join(remote_conf_directory(), "explorer")
 
 def list_global_explorers():
    """Return list of available explorers"""
diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index a59f909f..fce4033e 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -1,2 +1,4 @@
 - rewrite in python?
 - support non-ssh access?
+
+- Bug: os.path.join() may be wrong for the remote side!