diff --git a/lib/command.c b/lib/command.c
index a789b0f..8870a42 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -105,7 +105,7 @@
 };
 
 /* Default motd string. */
-const char *default_motd =
+static const char *default_motd =
 "\r\n\
 Hello, this is " QUAGGA_PROGNAME " (version " QUAGGA_VERSION ").\r\n\
 " QUAGGA_COPYRIGHT "\r\n\
diff --git a/pimd/Makefile.am b/pimd/Makefile.am
index 9345460..3b8a0e1 100644
--- a/pimd/Makefile.am
+++ b/pimd/Makefile.am
@@ -21,7 +21,6 @@
 
 # PIM_DEBUG_BYDEFAULT: Automatically enables all pimd "debug ..." commands
 # PIM_ZCLIENT_DEBUG: Support for internal ZEBRA client debugging
-# PIM_MOTD_VERSION: Includes pimd version in default MOTD
 # PIM_CHECK_RECV_IFINDEX_SANITY: Compare socket ifindex with recv ifindex
 # PIM_REPORT_RECV_IFINDEX_MISMATCH: Report sock/recv ifindex mismatch
 # PIM_ENFORCE_LOOPFREE_MFC: Refuse adding looping MFC entries
@@ -34,7 +33,6 @@
 PIM_DEFS += -DPIM_CHECK_RECV_IFINDEX_SANITY
 #PIM_DEFS += -DPIM_REPORT_RECV_IFINDEX_MISMATCH
 PIM_DEFS += -DPIM_ZCLIENT_DEBUG
-PIM_DEFS += -DPIM_MOTD_VERSION
 PIM_DEFS += -DPIM_ENFORCE_LOOPFREE_MFC
 #PIM_DEFS += -DPIM_UNEXPECTED_KERNEL_UPCALL
 #PIM_DEFS += -DPIM_USE_QUAGGA_GETTIME
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index 768ac08..68cfe21 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -46,7 +46,6 @@
 #endif
 
 extern struct host host;
-extern const char *default_motd;
 
 char config_default[] = SYSCONFDIR PIMD_DEFAULT_CONFIG;
 
@@ -246,18 +245,6 @@
   zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting, VTY interface at port TCP %d",
 	      QUAGGA_VERSION, PIMD_VERSION, vty_port);
 
-#ifdef PIM_MOTD_VERSION
-  /* Tweak default MOTD to include pimd version */
-  zlog_notice("PIM_MOTD_VERSION: adding pimd version to default MOTD");
-  if (host.motd == default_motd) {
-    host.motd =
-      "\r\n\
-Hello, this is " QUAGGA_PROGNAME " " QUAGGA_VERSION " " PIMD_PROGNAME " " PIMD_VERSION_STR "\r\n\
-" QUAGGA_COPYRIGHT "\r\n\
-\r\n";
-  }
-#endif
-
 #ifdef PIM_DEBUG_BYDEFAULT
   zlog_notice("PIM_DEBUG_BYDEFAULT: Enabling all debug commands");
   PIM_DO_DEBUG_PIM_EVENTS;