diff --git a/bin/cdist-config b/bin/cdist-config
new file mode 100755
index 00000000..9bba8b93
--- /dev/null
+++ b/bin/cdist-config
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# 2010 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Print configuration directories - helper for all other scripts
+#
+
+: ${CDIST_CONFIG:=/etc/cdist}
+: ${CDIST_COREDIR:=$CDIST_CONFIG/core}
+: ${CDIST_LIBDIR:=$CDIST_CONFIG/lib}
+
+
+#echo $CDIST_CONFIG
+#echo $CDIST_LIBDIR
diff --git a/bin/cdist-explore b/bin/cdist-explore
index 64cb1607..c6a6d529 100755
--- a/bin/cdist-explore
+++ b/bin/cdist-explore
@@ -19,12 +19,14 @@
 #
 #
 
-reports="os"
+reports="hostname os"
+
+. cdist-config
 
 for report in $reports; do
    func="cdist_explore_$report"
    var="__cdist_$report"
-   . "../lib/$func"
+   . "${CDIST_LIBDIR}/${func}"
    eval $var=\"\$\($func\)\"
    eval echo $var=\\\"\$$var\\\"
 done
diff --git a/conf/lib/cdist_explore_hostname b/conf/lib/cdist_explore_hostname
new file mode 100755
index 00000000..dbc0df1b
--- /dev/null
+++ b/conf/lib/cdist_explore_hostname
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# 2010 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+cdist_explore_hostname()
+{
+   hostname
+}