diff --git a/cdist/exec/local.py b/cdist/exec/local.py
index 854a1832..2f09ecbc 100644
--- a/cdist/exec/local.py
+++ b/cdist/exec/local.py
@@ -190,7 +190,7 @@ class Local(object):
 
                 for entry in os.listdir(current_dir):
                     rel_entry_path = os.path.join(sub_dir, entry)
-                    src = os.path.join(conf_dir, sub_dir, entry)
+                    src = os.path.abspath(os.path.join(conf_dir, sub_dir, entry))
                     dst = os.path.join(self.conf_path, sub_dir, entry)
 
                     # Already exists? remove and link
diff --git a/docs/changelog b/docs/changelog
index 12c4221e..3227caa9 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -4,6 +4,9 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
+2.3.1:
+	* Core: Support relative paths for configuration directories
+
 2.3.0: 2013-08-12
 	* Core: Added support for cdist shell
 	* Documentation: Improved some manpages