diff --git a/conf/type/__motd/manifest b/conf/type/__motd/manifest
index 4716f530..286d1ff3 100755
--- a/conf/type/__motd/manifest
+++ b/conf/type/__motd/manifest
@@ -26,7 +26,7 @@ else
    source="$__type/files/motd"
 fi
 
-os=$(cat $__global/explorer/os)
+os=$(cat "$__global/explorer/os")
 
 
 case "$os" in
diff --git a/conf/type/__motd/parameter/optional b/conf/type/__motd/parameter/optional
new file mode 100644
index 00000000..5a18cd2f
--- /dev/null
+++ b/conf/type/__motd/parameter/optional
@@ -0,0 +1 @@
+source
diff --git a/doc/changelog b/doc/changelog
index df18aa43..2c2aec57 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,3 +1,6 @@
+1.3.2:
+	* Add --source to __motd
+
 1.3.1: 2011-03-21
 	* Document cdist-type-build-emulation
 	* Document cdist-type-emulator