diff --git a/bacnet-stack/config.h b/bacnet-stack/config.h
index e42cfb48..69f3265e 100644
--- a/bacnet-stack/config.h
+++ b/bacnet-stack/config.h
@@ -26,6 +26,9 @@
 #if !defined(BACNET_VENDOR_ID)
     #define BACNET_VENDOR_ID 260
 #endif
+#if !defined(BACNET_VENDOR_NAME)
+    #define BACNET_VENDOR_NAME "BACnet Stack at SourceForge"
+#endif
 
 /* Max number of bytes in an APDU. */
 /* Typical sizes are 50, 128, 206, 480, 1024, and 1476 octets */
diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c
index 3e6a4ff0..b7707a3f 100644
--- a/bacnet-stack/demo/object/device.c
+++ b/bacnet-stack/demo/object/device.c
@@ -118,7 +118,7 @@ void Device_Property_Lists(
 static uint32_t Object_Instance_Number = 0;
 static char Object_Name[16] = "SimpleServer";
 static BACNET_DEVICE_STATUS System_Status = STATUS_OPERATIONAL;
-static char Vendor_Name[16] = "ASHRAE";
+static char *Vendor_Name = BACNET_VENDOR_NAME;
 static uint16_t Vendor_Identifier = BACNET_VENDOR_ID;
 static char Model_Name[16] = "GNU";
 static char Application_Software_Version[16] = "1.0";
@@ -220,19 +220,6 @@ const char *Device_Vendor_Name(void)
     return Vendor_Name;
 }
 
-bool Device_Set_Vendor_Name(const char *name, size_t length)
-{
-    bool status = false;        /*return value */
-
-    if (length < sizeof(Vendor_Name)) {
-        memmove(Vendor_Name, name, length);
-        Vendor_Name[length] = 0;
-        status = true;
-    }
-
-    return status;
-}
-
 uint16_t Device_Vendor_Identifier(void)
 {
     return Vendor_Identifier;
@@ -1012,11 +999,7 @@ void testDevice(Test * pTest)
     Device_Set_System_Status(STATUS_NON_OPERATIONAL);
     ct_test(pTest, Device_System_Status() == STATUS_NON_OPERATIONAL);
 
-    Device_Set_Vendor_Name(name, strlen(name));
-    ct_test(pTest, strcmp(Device_Vendor_Name(), name) == 0);
-
-    Device_Set_Vendor_Identifier(42);
-    ct_test(pTest, Device_Vendor_Identifier() == 42);
+    ct_test(pTest, Device_Vendor_Identifier() == BACNET_VENDOR_ID);
 
     Device_Set_Model_Name(name, strlen(name));
     ct_test(pTest, strcmp(Device_Model_Name(), name) == 0);
diff --git a/bacnet-stack/demo/object/device.h b/bacnet-stack/demo/object/device.h
index 766801f6..64033842 100644
--- a/bacnet-stack/demo/object/device.h
+++ b/bacnet-stack/demo/object/device.h
@@ -60,10 +60,8 @@ extern "C" {
     void Device_Set_System_Status(BACNET_DEVICE_STATUS status);
 
     const char *Device_Vendor_Name(void);
-    bool Device_Set_Vendor_Name(const char *name, size_t length);
 
     uint16_t Device_Vendor_Identifier(void);
-    void Device_Set_Vendor_Identifier(uint16_t vendor_id);
 
     const char *Device_Model_Name(void);
     bool Device_Set_Model_Name(const char *name, size_t length);
diff --git a/bacnet-stack/ports/at91sam7s/device.c b/bacnet-stack/ports/at91sam7s/device.c
index b8a88cab..b3662646 100644
--- a/bacnet-stack/ports/at91sam7s/device.c
+++ b/bacnet-stack/ports/at91sam7s/device.c
@@ -112,10 +112,9 @@ void Device_Set_System_Status(BACNET_DEVICE_STATUS status)
         System_Status = status;
 }
 
-/* FIXME: put your vendor ID here! */
 uint16_t Device_Vendor_Identifier(void)
 {
-    return 0;
+    return BACNET_VENDOR_ID;
 }
 
 uint8_t Device_Protocol_Version(void)
@@ -277,7 +276,7 @@ int Device_Encode_Property_APDU(uint8_t * apdu,
             encode_tagged_enumerated(&apdu[0], Device_System_Status());
         break;
     case PROP_VENDOR_NAME:
-        characterstring_init_ansi(&char_string, "ASHRAE");
+        characterstring_init_ansi(&char_string, BACNET_VENDOR_NAME);
         apdu_len = encode_tagged_character_string(&apdu[0], &char_string);
         break;
     case PROP_VENDOR_IDENTIFIER:
diff --git a/bacnet-stack/ports/atmega168/device.c b/bacnet-stack/ports/atmega168/device.c
index c7f1681a..a9323c07 100644
--- a/bacnet-stack/ports/atmega168/device.c
+++ b/bacnet-stack/ports/atmega168/device.c
@@ -285,7 +285,7 @@ int Device_Encode_Property_APDU(uint8_t * apdu,
             encode_tagged_enumerated(&apdu[0], Device_System_Status());
         break;
     case PROP_VENDOR_NAME:
-        characterstring_init_ansi(&char_string, "ASHRAE");
+        characterstring_init_ansi(&char_string, BACNET_VENDOR_NAME);
         apdu_len = encode_tagged_character_string(&apdu[0], &char_string);
         break;
     case PROP_VENDOR_IDENTIFIER:
diff --git a/bacnet-stack/ports/pic18f6720/device.c b/bacnet-stack/ports/pic18f6720/device.c
index 9e7dbdd1..f2a43fff 100644
--- a/bacnet-stack/ports/pic18f6720/device.c
+++ b/bacnet-stack/ports/pic18f6720/device.c
@@ -285,7 +285,7 @@ int Device_Encode_Property_APDU(uint8_t * apdu,
             encode_tagged_enumerated(&apdu[0], Device_System_Status());
         break;
     case PROP_VENDOR_NAME:
-        (void) strcpypgm2ram(&string_buffer[0], "ASHRAE");
+        (void) strcpypgm2ram(&string_buffer[0], BACNET_VENDOR_NAME);
         characterstring_init_ansi(&char_string, string_buffer);
         apdu_len = encode_tagged_character_string(&apdu[0], &char_string);
         break;