diff --git a/cdist/conf/type/__issue/manifest b/cdist/conf/type/__issue/manifest
index 06eb120a..0f0b3d83 100755
--- a/cdist/conf/type/__issue/manifest
+++ b/cdist/conf/type/__issue/manifest
@@ -25,6 +25,9 @@ os="$(cat "$__global/explorer/os")"
 
 if [ -f "$__object/parameter/source" ]; then
     source="$(cat "$__object/parameter/source")"
+    if [ "$source" = "-" ]; then
+        source="${__object}/stdin"
+    fi
 else
     case "$os" in
         archlinux|redhat)
diff --git a/cdist/conf/type/__motd/manifest b/cdist/conf/type/__motd/manifest
index 0e2e8097..cd741cf4 100755
--- a/cdist/conf/type/__motd/manifest
+++ b/cdist/conf/type/__motd/manifest
@@ -22,6 +22,9 @@
 # Select motd source
 if [ -f "$__object/parameter/source" ]; then
    source="$(cat "$__object/parameter/source")"
+    if [ "$source" = "-" ]; then
+        source="${__object}/stdin"
+    fi
 else
    source="$__type/files/motd"
 fi