diff --git a/ChangeLog b/ChangeLog
index 462665a2..846e10c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-30  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	* ser_posix.c (baud_lookup_table): Conditionalize the inclusion of
+	non-standard baud rates (only baud rates up to B38400 are
+	standardized by the Single UNIX Specification).
+
 2011-12-29  Rene Liebscher <R.Liebscher@gmx.de>
 
 	bug #34302: Feature request : device configuration with parent classes
diff --git a/ser_posix.c b/ser_posix.c
index 210bff20..3ddf3dd6 100644
--- a/ser_posix.c
+++ b/ser_posix.c
@@ -62,9 +62,15 @@ static struct baud_mapping baud_lookup_table [] = {
   { 9600,   B9600 },
   { 19200,  B19200 },
   { 38400,  B38400 },
+#ifdef B57600
   { 57600,  B57600 },
+#endif
+#ifdef B115200
   { 115200, B115200 },
+#endif
+#ifdef B230400
   { 230400, B230400 },
+#endif
   { 0,      0 }                 /* Terminator. */
 };