diff --git a/mkmotd/mkmotd.pl b/mkmotd/mkmotd.pl
index ab9a265..82d18a0 100755
--- a/mkmotd/mkmotd.pl
+++ b/mkmotd/mkmotd.pl
@@ -41,16 +41,7 @@
 
 EOF
 
-    $TEMPLATE .= "    / to bee or not to bee /   ";
-
-    if ( -d '/node/tags' ) {
-        $_ = `ls /node/tags`;
-        s/\n/ /g;
-        $TEMPLATE .= "tags: $_";
-    }
-
-    $TEMPLATE .= "\n";
-
+    $TEMPLATE .= "    / to bee or not to bee /   tags: ".`hostconfig`."\n";
 }
 else {
     die "$os_release : unknown os_release\n";