diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c
index fa542d92..c5404cf6 100644
--- a/bacnet-stack/demo/object/device.c
+++ b/bacnet-stack/demo/object/device.c
@@ -58,7 +58,7 @@ static char Vendor_Name[16] = "ASHRAE";
 /* FIXME: your vendor id assigned by ASHRAE */
 static uint16_t Vendor_Identifier = 0;
 static char Model_Name[16] = "GNU";
-static char Firmware_Revision[16] = "1.0";
+static char Firmware_Revision[16] = "0.3.1";
 static char Application_Software_Version[16] = "1.0";
 static char Location[16] = "USA";
 static char Description[16] = "server";
diff --git a/bacnet-stack/ports/pic18f6720/device.c b/bacnet-stack/ports/pic18f6720/device.c
index 3780805a..7fb4a622 100644
--- a/bacnet-stack/ports/pic18f6720/device.c
+++ b/bacnet-stack/ports/pic18f6720/device.c
@@ -298,12 +298,12 @@ int Device_Encode_Property_APDU(uint8_t * apdu,
         apdu_len = encode_tagged_character_string(&apdu[0], &char_string);
         break;
     case PROP_FIRMWARE_REVISION:
-        (void) strcpypgm2ram(&string_buffer[0], "1.00");
+        (void) strcpypgm2ram(&string_buffer[0], "0.3.1");
         characterstring_init_ansi(&char_string, string_buffer);
         apdu_len = encode_tagged_character_string(&apdu[0], &char_string);
         break;
     case PROP_APPLICATION_SOFTWARE_VERSION:
-        (void) strcpypgm2ram(&string_buffer[0], "1.00");
+        (void) strcpypgm2ram(&string_buffer[0], "1.0");
         characterstring_init_ansi(&char_string, string_buffer);
         apdu_len = encode_tagged_character_string(&apdu[0], &char_string);
         break;