diff --git a/bacnet-stack/bacapp.c b/bacnet-stack/bacapp.c
index f58aa2d7..630acb23 100644
--- a/bacnet-stack/bacapp.c
+++ b/bacnet-stack/bacapp.c
@@ -739,10 +739,10 @@ void testBACnetApplicationData(Test * pTest)
 
   status = bacapp_parse_application_data(
     BACNET_APPLICATION_TAG_DATE,
-    "5/5/22:1",
+    "2005/5/22:1",
     &value);
   ct_test(pTest,status == true);
-  ct_test(pTest,value.type.Date.year == 5);
+  ct_test(pTest,value.type.Date.year == 2005);
   ct_test(pTest,value.type.Date.month == 5);
   ct_test(pTest,value.type.Date.day == 22);
   ct_test(pTest,value.type.Date.wday == 1);
diff --git a/bacnet-stack/bacapp.mak b/bacnet-stack/bacapp.mak
index c4f36538..04b30e2a 100644
--- a/bacnet-stack/bacapp.mak
+++ b/bacnet-stack/bacapp.mak
@@ -10,6 +10,8 @@ SRCS = bacdcode.c \
        bacstr.c \
        bacapp.c \
        bigend.c \
+       bactext.c \
+       indtext.c \
        test/ctest.c
 
 OBJS = ${SRCS:.c=.o}
diff --git a/bacnet-stack/bacdcode.c b/bacnet-stack/bacdcode.c
index 0a1dcd46..15a4adcf 100644
--- a/bacnet-stack/bacdcode.c
+++ b/bacnet-stack/bacdcode.c
@@ -1393,6 +1393,14 @@ int decode_bacnet_time(uint8_t * apdu, int *hour, int *min, int *sec,
 int encode_bacnet_date(uint8_t * apdu, int year, int month, int day,
     int wday)
 {
+    /* allow 2 digit years */
+    if (year < 1900)
+    {
+      if (year <= 38)
+	      year += 2000;
+      else
+	      year += 1900;
+    }
     apdu[0] = year - 1900;
     apdu[1] = month;
     apdu[2] = day;
diff --git a/bacnet-stack/demo/object/device.mak b/bacnet-stack/demo/object/device.mak
index 6d4609bc..d0c10967 100644
--- a/bacnet-stack/demo/object/device.mak
+++ b/bacnet-stack/demo/object/device.mak
@@ -11,6 +11,7 @@ SRCS = bacdcode.c \
        bigend.c \
        bacstr.c \
        apdu.c \
+       dcc.c \
        demo/object/device.c \
        test/ctest.c
 
diff --git a/bacnet-stack/iam.mak b/bacnet-stack/iam.mak
index 8dcdbf48..4afea483 100755
--- a/bacnet-stack/iam.mak
+++ b/bacnet-stack/iam.mak
@@ -11,6 +11,7 @@ SRCS = bacdcode.c \
        bigend.c \
        npdu.c \
        apdu.c \
+       dcc.c \
        iam.c \
        test/ctest.c
 
diff --git a/bacnet-stack/npdu.mak b/bacnet-stack/npdu.mak
index 38c38a49..1cee4f41 100644
--- a/bacnet-stack/npdu.mak
+++ b/bacnet-stack/npdu.mak
@@ -11,6 +11,7 @@ SRCS = bacdcode.c \
        bigend.c \
        npdu.c \
        apdu.c \
+       dcc.c \
        test/ctest.c
 
 OBJS = ${SRCS:.c=.o}
diff --git a/bacnet-stack/rpm.mak b/bacnet-stack/rpm.mak
index b4d52166..6d320400 100644
--- a/bacnet-stack/rpm.mak
+++ b/bacnet-stack/rpm.mak
@@ -9,6 +9,8 @@ CFLAGS  = -Wall -I. -Itest -DTEST -DTEST_READ_PROPERTY_MULTIPLE -g
 SRCS = bacdcode.c \
        bacerror.c \
        bacapp.c \
+       bactext.c \
+       indtext.c \
        bacstr.c \
        bigend.c \
        rpm.c \
diff --git a/bacnet-stack/tsm.mak b/bacnet-stack/tsm.mak
index 3e9239eb..6744f3b0 100644
--- a/bacnet-stack/tsm.mak
+++ b/bacnet-stack/tsm.mak
@@ -13,6 +13,7 @@ SRCS = address.c \
        demo/object/ai.c \
        demo/object/ao.c \
        iam.c \
+       dcc.c \
        npdu.c \
        apdu.c \
        datalink.c \
diff --git a/bacnet-stack/unittest.sh b/bacnet-stack/unittest.sh
index 3708fb46..5452e6bb 100755
--- a/bacnet-stack/unittest.sh
+++ b/bacnet-stack/unittest.sh
@@ -14,6 +14,11 @@ make -f address.mak
 ./address >> test.log
 make -f address.mak clean
 
+make -f dcc.mak clean
+make -f dcc.mak
+./dcc >> test.log
+make -f dcc.mak clean
+
 make -f demo/object/ai.mak clean
 make -f demo/object/ai.mak
 ./analog_input >> test.log
@@ -84,6 +89,11 @@ make -f npdu.mak
 ./npdu >> test.log
 make -f npdu.mak clean
 
+make -f rd.mak clean
+make -f rd.mak
+./reinitialize_device >> test.log
+make -f rd.mak clean
+
 make -f reject.mak clean
 make -f reject.mak
 ./reject >> test.log
@@ -119,6 +129,11 @@ make -f whois.mak
 ./whois >> test.log
 make -f whois.mak clean
 
+make -f whohas.mak clean
+make -f whohas.mak
+./whohas >> test.log
+make -f whohas.mak clean
+
 make -f wp.mak clean
 make -f wp.mak
 ./writeproperty >> test.log
diff --git a/bacnet-stack/wp.c b/bacnet-stack/wp.c
index 4b3c51f0..e5c258d8 100644
--- a/bacnet-stack/wp.c
+++ b/bacnet-stack/wp.c
@@ -332,7 +332,7 @@ void testWriteProperty(Test * pTest)
   testWritePropertyTag(pTest, &data);
   
   data.value.tag = BACNET_APPLICATION_TAG_DATE;
-  data.value.type.Date.year = 5;
+  data.value.type.Date.year = 2005;
   data.value.type.Date.month = 5;
   data.value.type.Date.day = 22;
   data.value.type.Date.wday = 1;
diff --git a/bacnet-stack/wp.mak b/bacnet-stack/wp.mak
index ac1f999c..d02545e1 100644
--- a/bacnet-stack/wp.mak
+++ b/bacnet-stack/wp.mak
@@ -10,6 +10,8 @@ SRCS = bacdcode.c \
        bacstr.c \
        bigend.c \
        bacapp.c \
+       bactext.c \
+       indtext.c \
        wp.c \
        test/ctest.c