diff --git a/cdist/exec/local.py b/cdist/exec/local.py
index 72c7e70f..4233b874 100644
--- a/cdist/exec/local.py
+++ b/cdist/exec/local.py
@@ -194,7 +194,12 @@ class Local(object):
         return self.run(command=command, env=env, return_output=return_output, message_prefix=message_prefix)
 
     def save_cache(self):
-        destination = os.path.join(self.cache_path, self.target_host)
+        if os.path.isabs(self.target_host):
+            hostdir = self.target_host[1:]
+        else:
+            hostdir = self.target_host
+
+        destination = os.path.join(self.cache_path, hostdir)
         self.log.debug("Saving " + self.base_path + " to " + destination)
 
         try:
diff --git a/docs/changelog b/docs/changelog
index 45cf35b7..f75bfa9a 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -6,6 +6,7 @@ Changelog
 
 3.0.1:
 	* Core: Copy only files, not directories (Steven Armstrong)
+	* Core: Allow hostnames to start with /
 	* Type __line: Remove unecessary backslash escape
 	* Type __directory: Add messaging support (Daniel Heule)
 	* Type __directory: Do not generate code if mode is 0xxx ((Daniel Heule)