diff --git a/cdist/conf/explorer/hostname b/cdist/conf/explorer/hostname
index 2ae23759..881c910a 100755
--- a/cdist/conf/explorer/hostname
+++ b/cdist/conf/explorer/hostname
@@ -20,6 +20,6 @@
 #
 #
 
-if command -v hostname; then
-   hostname
+if command -v hostname >/dev/null; then
+   hostname -f
 fi
diff --git a/cdist/core/manifest.py b/cdist/core/manifest.py
index 19639618..8da7f96d 100644
--- a/cdist/core/manifest.py
+++ b/cdist/core/manifest.py
@@ -106,6 +106,7 @@ class Manifest(object):
         env.update(self.env)
         env['__cdist_manifest'] = initial_manifest
         env['__manifest'] = self.local.manifest_path
+        env['__explorer'] = self.local.global_explorer_out_path
 
         return env