diff --git a/lib/command.c b/lib/command.c
index 71db3aa..e8c9203 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -39,7 +39,7 @@
 /* Default motd string. */
 char *default_motd = 
 "\r\n\
-Hello, this is quagga (version " QUAGGA_VERSION ").\r\n\
+Hello, this is " QUAGGA_PROGNAME " (version " QUAGGA_VERSION ").\r\n\
 Copyright 1996-2002 Kunihiro Ishiguro.\r\n\
 \r\n";
 
diff --git a/lib/smux.c b/lib/smux.c
index 2062b87..ddb8bfe 100644
--- a/lib/smux.c
+++ b/lib/smux.c
@@ -952,7 +952,7 @@
   u_char *ptr;
   int len;
   u_long version;
-  u_char progname[] = "quagga-" QUAGGA_VERSION;
+  u_char progname[] = QUAGGA_PROGNAME "-" QUAGGA_VERSION;
 
   if (debug_smux)
     {
diff --git a/lib/version.h b/lib/version.h
index 84df21c..f0387f0 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -22,6 +22,8 @@
 #ifndef _ZEBRA_VERSION_H
 #define _ZEBRA_VERSION_H
 
+#define QUAGGA_PROGNAME   "quagga"
+
 #define QUAGGA_VERSION     "0.96"
 
 #define ZEBRA_BUG_ADDRESS "bug-zebra@gnu.org"
diff --git a/vtysh/vtysh_user.c b/vtysh/vtysh_user.c
index ecbe0f4..8698f8f 100644
--- a/vtysh/vtysh_user.c
+++ b/vtysh/vtysh_user.c
@@ -51,7 +51,7 @@
   pam_handle_t *pamh = NULL;
 
   /* Start PAM. */
-  ret = pam_start("zebra", user, &conv, &pamh);
+  ret = pam_start(QUAGGA_PROGNAME, user, &conv, &pamh);
   /* printf ("ret %d\n", ret); */
 
   /* Is user really user? */