diff --git a/bin/cdist-build b/bin/cdist-build
index a26b9458..8306242b 100755
--- a/bin/cdist-build
+++ b/bin/cdist-build
@@ -23,7 +23,7 @@
 
 . cdist-config
 
-[ $# -eq 1 ] || __cdist_usage "target"
+[ $# -eq 1 ] || __cdist_usage "target_host"
 
 set -e
 
diff --git a/bin/cdist-preprocess b/bin/cdist-preprocess
index bb47972f..822b7008 100755
--- a/bin/cdist-preprocess
+++ b/bin/cdist-preprocess
@@ -26,13 +26,14 @@
 [ $# -eq 1 ] || __cdist_usage "target"
 
 set -e
-cdist-build-explorer | ssh "$1" > "${CDIST_TMP}"
+cdist-build-explorer | ssh "$1" > "${__cdist_tmp_file}"
 
 # FIXME: Warning: An untrusted/compromised client could in theory exploit us
 # And a filter function like grep '^__cdist_explore.*=".*"$'
 # is probably not effective!
-. "${CDIST_TMP}"
+. "${__cdist_tmp_file}"
 
 
-# Create cconfig for the host
-# cdist-manifest ...
+# Create cconfig for the host - FIXME: replace with a recursive version
+# to allow type runners, overwrites and merges
+cdist-manifest-init
diff --git a/conf/README b/conf/README
new file mode 100644
index 00000000..54a2d8a5
--- /dev/null
+++ b/conf/README
@@ -0,0 +1,7 @@
+This is a sample configuration that can be used as an example
+for /etc/cdist.
+
+For instance:
+
+   [root@kr etc]# ln -s ~nico/p/cdist/conf/ /etc/cdist
+