diff --git a/lib/ChangeLog b/lib/ChangeLog
index 4410fb2..ad81ed5 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-14  Greg Troxel  <gdt@fnord.ir.bbn.com>
+
+	* command.c (print_version): Don't print host.name if it is NULL.
+	Fixes segfault on Solaris reported by Goetz von Escher <goetz@open.ch>
+	
 2005-01-12 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
 	* sigevent.c: (trap_default_signals) Use the SA_SIGINFO flag to
diff --git a/lib/command.c b/lib/command.c
index b1260af..3891733 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -1,5 +1,5 @@
 /*
-   $Id: command.c,v 1.31 2005/01/02 18:51:01 hasso Exp $
+   $Id: command.c,v 1.32 2005/01/14 15:47:33 gdt Exp $
 
    Command interpreter routine for virtual terminal [aka TeletYpe]
    Copyright (C) 1997, 98, 99 Kunihiro Ishiguro
@@ -145,8 +145,10 @@
 void
 print_version (const char *progname)
 {
-  printf ("%s version %s (%s)\n", progname, QUAGGA_VERSION, host.name);
-  printf ("%s\n", QUAGGA_COPYRIGHT);
+  printf ("%s version %s", progname, QUAGGA_VERSION);
+  if (host.name != NULL)
+    printf (" (%s)", host.name);
+  printf ("\n%s\n", QUAGGA_COPYRIGHT);
 }