diff --git a/balazs/dot-cdist/manifest/init b/balazs/dot-cdist/manifest/init
index eadb079..a1668c1 100644
--- a/balazs/dot-cdist/manifest/init
+++ b/balazs/dot-cdist/manifest/init
@@ -4,9 +4,9 @@ case "$__target_host" in
      __file /etc/cdist-configured
 
      # Copy a cool motd from the type's file directory
-     __file /etc/motd --state present --source "$__files/motd"
+     __motd --source "$__files/motd"
 
-     __package emacs --state present
+     __package emacs nmap mosh --state present
 
      __timezone Europe/Zurich
 ;;