diff --git a/conf/type/__motd/manifest b/conf/type/__motd/manifest
index 594977b9..a6e963f1 100755
--- a/conf/type/__motd/manifest
+++ b/conf/type/__motd/manifest
@@ -19,8 +19,6 @@
 #
 #
 
-destination=/etc/motd
-
 # Select motd source
 if [ -f "$__object/parameter/source" ]; then
    source="$(cat "$__object/parameter/source")"
@@ -28,4 +26,16 @@ else
    source="$__type/files/motd"
 fi
 
+os=$(cat $__global/explorer/os)
+
+
+case "$os" in
+   debian|ubuntu)
+      destination=/etc/motd.tail
+   ;;
+   *)
+      destination=/etc/motd
+   ;;
+esac
+
 __file "$destination" --source "$source" --type file