diff --git a/bacnet-stack/bbmd.c b/bacnet-stack/bbmd.c
new file mode 100644
index 00000000..0f616855
--- /dev/null
+++ b/bacnet-stack/bbmd.c
@@ -0,0 +1,78 @@
+/*####COPYRIGHTBEGIN####
+ -------------------------------------------
+ Copyright (C) 2006 Steve Karg
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to:
+ The Free Software Foundation, Inc.
+ 59 Temple Place - Suite 330
+ Boston, MA  02111-1307, USA.
+
+ As a special exception, if other files instantiate templates or
+ use macros or inline functions from this file, or you compile
+ this file and link it with other works to produce a work based
+ on this file, this file does not by itself cause the resulting
+ work to be covered by the GNU General Public License. However
+ the source code for this file must still be made available in
+ accordance with section (3) of the GNU General Public License.
+
+ This exception does not invalidate any other reasons why a work
+ based on this file might be covered by the GNU General Public
+ License.
+ -------------------------------------------
+####COPYRIGHTEND####*/
+
+#include <stdint.h>             /* for standard integer types uint8_t etc. */
+#include <stdbool.h>            /* for the standard bool type. */
+#include "bacdcode.h"
+#include "bip.h"
+#include "net.h"                /* custom per port */
+
+/* Handle the BACnet Broadcast Management Device,
+   Broadcast Distribution Table, and Foreign Device Registration */
+   
+void bbmd_handler(uint8_t *buf, int len, struct sockaddr_in *sin)
+{
+  int function_type = 0;
+  
+    if (buf[0] != 0x81)
+      return;
+    function_type = buf[1];
+    switch (function_type)
+    {
+      case 0:
+        break;
+      case 1:
+        break;
+      case 2:
+        break;
+      case 3:
+        break;
+      case 4:
+        break;
+      case 5:
+        break;
+      case 6:
+        break;
+      case 7:
+        break;
+      case 8:
+        break;
+      case 9:
+        break;
+      default:
+        break;
+    }
+    
+    return;
+}
diff --git a/bacnet-stack/bbmd.h b/bacnet-stack/bbmd.h
new file mode 100644
index 00000000..e9725172
--- /dev/null
+++ b/bacnet-stack/bbmd.h
@@ -0,0 +1,51 @@
+/*####COPYRIGHTBEGIN####
+ -------------------------------------------
+ Copyright (C) 2006 Steve Karg
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to:
+ The Free Software Foundation, Inc.
+ 59 Temple Place - Suite 330
+ Boston, MA  02111-1307, USA.
+
+ As a special exception, if other files instantiate templates or
+ use macros or inline functions from this file, or you compile
+ this file and link it with other works to produce a work based
+ on this file, this file does not by itself cause the resulting
+ work to be covered by the GNU General Public License. However
+ the source code for this file must still be made available in
+ accordance with section (3) of the GNU General Public License.
+
+ This exception does not invalidate any other reasons why a work
+ based on this file might be covered by the GNU General Public
+ License.
+ -------------------------------------------
+####COPYRIGHTEND####*/
+#ifndef BBMD_H
+#define BBMD_H
+
+#include <stdint.h>             /* for standard integer types uint8_t etc. */
+#include <stdbool.h>            /* for the standard bool type. */
+#include "bip.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif                          /* __cplusplus */
+
+void bbmd_handler(uint8_t *buf, int len, struct sockaddr_in *sin);
+
+#ifdef __cplusplus
+}
+#endif                          /* __cplusplus */
+
+#endif
diff --git a/bacnet-stack/bip.c b/bacnet-stack/bip.c
index 6dd78055..c0252682 100644
--- a/bacnet-stack/bip.c
+++ b/bacnet-stack/bip.c
@@ -273,6 +273,11 @@ uint16_t bip_receive(BACNET_ADDRESS * src,      /* source address */
                 pdu_len = 0;
         }
     }
+    #ifdef BBMD_ENABLED
+    if (buf[1] <= 0x09) {
+      bbmd_handler(&buf[0], received_bytes, &sin); 
+    }
+    #endif
 
     return pdu_len;
 }