diff --git a/mkmotd/mkmotd.pl b/mkmotd/mkmotd.pl
index 196537c1..8da25dcc 100755
--- a/mkmotd/mkmotd.pl
+++ b/mkmotd/mkmotd.pl
@@ -43,7 +43,7 @@
 
 EOF
 
-    $TEMPLATE .= "    / to bee or not to bee /   tags: ".join(" ",@hostconfig)."\n";
+    $TEMPLATE .= "  tags: ".join(" ",@hostconfig)."\n\n";
 }
 else {
     die "$os_release : unknown os_release\n";
@@ -201,5 +201,7 @@ sub policy {    # policy('theinternet') --> ('zeile1,'zeile2',....)
 
 $TEMPLATE =~ s/%(\S+?)%/$T{$1}||$1/eg;
 open O, '>', '/etc/motd' or die "/etc/motd: $!\n";
-print O $TEMPLATE, ( join( "\n", map ( "  ** $_ **", policy( $T{HOST} ) ) ) || "  ** **" ), "\n\n";
+print O $TEMPLATE;
+my @policy = policy($T{HOST});
+print O join("\n", map("  * $_", @policy)), "\n\n" if @policy;
 close O;