diff --git a/CHANGES.md b/CHANGES.md
index cc70734..029bf10 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,6 +7,8 @@
 
 ### New Features: ###
 
+- Dire Wolf now advertises itself using DNS Service Discovery.  This allows suitable APRS / Packet Radio applications to find a network KISS TNC without knowing the IP address or TCP port.    Thanks to Hessu for providing this.  Currently available only for Linux and Mac OSX.  [Read all about it here.](https://github.com/hessu/aprs-specs/blob/master/TCP-KISS-DNS-SD.md)
+
 - The transmit calibration tone (-x) command line option now accepts a radio channel number and/or a single letter mode:  a = alternate tones, m = mark tone, s = space tone, p = PTT only no sound.
 
 - The BEACON configuration now recognizes the SOURCE= option.  This replaces the AX.25 source address rather than using the MYCALL value for the channel.  This is useful for sending more than 5 analog telemetry channels.  Use two, or more, source addresses with up to 5 analog channels each.
diff --git a/src/direwolf.c b/src/direwolf.c
index 5db881b..188b087 100644
--- a/src/direwolf.c
+++ b/src/direwolf.c
@@ -296,7 +296,7 @@ int main (int argc, char *argv[])
 	//dw_printf ("Dire Wolf version %d.%d\n", MAJOR_VERSION, MINOR_VERSION);
 
 
-#if defined(ENABLE_GPSD) || defined(USE_HAMLIB) || defined(USE_CM108)
+#if defined(ENABLE_GPSD) || defined(USE_HAMLIB) || defined(USE_CM108) || USE_AVAHI_CLIENT || USE_MACOS_DNSSD
 	dw_printf ("Includes optional support for: ");
 #if defined(ENABLE_GPSD)
 	dw_printf (" gpsd");
@@ -306,6 +306,9 @@ int main (int argc, char *argv[])
 #endif
 #if defined(USE_CM108)
 	dw_printf (" cm108-ptt");
+#endif
+#if (USE_AVAHI_CLIENT|USE_MACOS_DNSSD)
+	dw_printf (" dns-sd");
 #endif
 	dw_printf ("\n");
 #endif
diff --git a/src/serial_port.c b/src/serial_port.c
index 7dff33a..5fbc5e0 100644
--- a/src/serial_port.c
+++ b/src/serial_port.c
@@ -237,12 +237,14 @@ MYFDTYPE serial_port_open (char *devicename, int baud)
 	  case 9600:	cfsetispeed (&ts, B9600);	cfsetospeed (&ts, B9600); 	break;
 	  case 19200:	cfsetispeed (&ts, B19200);	cfsetospeed (&ts, B19200); 	break;
 	  case 38400:	cfsetispeed (&ts, B38400);	cfsetospeed (&ts, B38400); 	break;
-#ifndef __APPLE__
+// This does not seem to be a problem anymore.
+// Leaving traces behind, as clue, in case failure is encountered in some older version.
+//#ifndef __APPLE__
 	  // Not defined for Mac OSX.
 	  // https://groups.yahoo.com/neo/groups/direwolf_packet/conversations/messages/2072
 	  case 57600:	cfsetispeed (&ts, B57600);	cfsetospeed (&ts, B57600); 	break;
 	  case 115200:	cfsetispeed (&ts, B115200);	cfsetospeed (&ts, B115200); 	break;
-#endif
+//#endif
 	  default:	text_color_set(DW_COLOR_ERROR);
 	  		dw_printf ("serial_port_open: Unsupported speed %d.  Using 4800.\n", baud);
 			cfsetispeed (&ts, B4800);	cfsetospeed (&ts, B4800);