diff --git a/acconfig.h b/acconfig.h
index a634036..82d350f 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,19 +1,20 @@
 /* acconfig.h
-   $Id$
-   This file is in the public domain.
+*   $Id$
+*   This file is in the public domain.
+*
+*   Descriptive text for the C preprocessor macros that
+*   the distributed Autoconf macros can define.
+*   No software package will use all of them; autoheader copies the ones
+*   your configure.in uses into your configuration header file templates.
+*
+*   The entries are in sort -df order: alphabetical, case insensitive,
+*   ignoring punctuation (such as underscores).  Although this order
+*   can split up related entries, it makes it easier to check whether
+*   a given entry is in the file.
+*/
+/*   Leave the following blank line there!!  Autoheader needs it.  */
 
-   Descriptive text for the C preprocessor macros that
-   the distributed Autoconf macros can define.
-   No software package will use all of them; autoheader copies the ones
-   your configure.in uses into your configuration header file templates.
 
-   The entries are in sort -df order: alphabetical, case insensitive,
-   ignoring punctuation (such as underscores).  Although this order
-   can split up related entries, it makes it easier to check whether
-   a given entry is in the file.
-
-   Leave the following blank line there!!  Autoheader needs it.  */
-
 #undef LIRCIN_DRV
 
 #undef CFONTZ_DRV
diff --git a/server/drivers/CFontz.c b/server/drivers/CFontz.c
index 343e888..4f05d09 100644
--- a/server/drivers/CFontz.c
+++ b/server/drivers/CFontz.c
@@ -113,8 +113,6 @@ CFontz_init (lcd_logical_driver * driver, char *args)
 				speed = B2400;
 			else if (tmp == 9600)
 				speed = B9600;
-			else if (tmp == 19200)
-				speed = B19200;
 			else {
 				fprintf (stderr, "CFontz_init: %s argument must be 1200, 2400, or 9600. Using default value.\n", argv[i]);
 			}
diff --git a/server/main.c b/server/main.c
index cfce18d..c41a95e 100644
--- a/server/main.c
+++ b/server/main.c
@@ -58,6 +58,7 @@ static parameter args[] = {
 	{"-t", "--type"},
 	{"-f", "--foreground"},
 	{"-b", "--backlight"},
+	{"-i", "--serverinfo"},
 	{NULL, NULL},
 };