diff --git a/bacnet-stack/demo/readfile/Makefile b/bacnet-stack/demo/readfile/Makefile
index 072c6162..8574eb5b 100644
--- a/bacnet-stack/demo/readfile/Makefile
+++ b/bacnet-stack/demo/readfile/Makefile
@@ -66,7 +66,8 @@ SRCS = main.c \
        $(BACNET_ROOT)/reject.c \
        $(BACNET_ROOT)/bacerror.c \
        $(BACNET_ROOT)/apdu.c \
-       $(BACNET_ROOT)/npdu.c
+       $(BACNET_ROOT)/npdu.c \
+       $(BACNET_ROOT)/version.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/demo/readfile/makefile.b32 b/bacnet-stack/demo/readfile/makefile.b32
index 307b3025..1d8e21c7 100644
--- a/bacnet-stack/demo/readfile/makefile.b32
+++ b/bacnet-stack/demo/readfile/makefile.b32
@@ -59,7 +59,8 @@ SRCS = main.c \
        ..\..\reject.c \
        ..\..\bacerror.c \
        ..\..\apdu.c \
-       ..\..\npdu.c
+       ..\..\npdu.c \
+       ..\..\version.c
 
 OBJS = $(SRCS:.c=.obj)
 
diff --git a/bacnet-stack/demo/readprop/Makefile b/bacnet-stack/demo/readprop/Makefile
index 6f67b026..3d9b3ae7 100644
--- a/bacnet-stack/demo/readprop/Makefile
+++ b/bacnet-stack/demo/readprop/Makefile
@@ -68,7 +68,8 @@ SRCS = main.c \
        $(BACNET_ROOT)/reject.c \
        $(BACNET_ROOT)/bacerror.c \
        $(BACNET_ROOT)/apdu.c \
-       $(BACNET_ROOT)/npdu.c
+       $(BACNET_ROOT)/npdu.c \
+       $(BACNET_ROOT)/version.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/demo/readprop/makefile.b32 b/bacnet-stack/demo/readprop/makefile.b32
index 240b734e..0373896b 100644
--- a/bacnet-stack/demo/readprop/makefile.b32
+++ b/bacnet-stack/demo/readprop/makefile.b32
@@ -61,7 +61,8 @@ SRCS = main.c \
        ..\..\reject.c \
        ..\..\bacerror.c \
        ..\..\apdu.c \
-       ..\..\npdu.c
+       ..\..\npdu.c \
+       ..\..\version.c
 
 OBJS = $(SRCS:.c=.obj)
 
diff --git a/bacnet-stack/demo/reinit/Makefile b/bacnet-stack/demo/reinit/Makefile
index 7b446e0d..0fe701bf 100644
--- a/bacnet-stack/demo/reinit/Makefile
+++ b/bacnet-stack/demo/reinit/Makefile
@@ -69,7 +69,8 @@ SRCS = main.c \
        $(BACNET_ROOT)/reject.c \
        $(BACNET_ROOT)/bacerror.c \
        $(BACNET_ROOT)/apdu.c \
-       $(BACNET_ROOT)/npdu.c
+       $(BACNET_ROOT)/npdu.c \
+       $(BACNET_ROOT)/version.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/demo/reinit/makefile.b32 b/bacnet-stack/demo/reinit/makefile.b32
index faf67ae0..87546ff3 100644
--- a/bacnet-stack/demo/reinit/makefile.b32
+++ b/bacnet-stack/demo/reinit/makefile.b32
@@ -61,7 +61,8 @@ SRCS = main.c \
        ..\..\reject.c \
        ..\..\bacerror.c \
        ..\..\apdu.c \
-       ..\..\npdu.c
+       ..\..\npdu.c \
+       ..\..\version.c
 
 OBJS = $(SRCS:.c=.obj)
 
diff --git a/bacnet-stack/demo/server/Makefile b/bacnet-stack/demo/server/Makefile
index 3481718e..ec3102d3 100644
--- a/bacnet-stack/demo/server/Makefile
+++ b/bacnet-stack/demo/server/Makefile
@@ -84,7 +84,8 @@ SRCS = main.c \
        $(BACNET_ROOT)/reject.c \
        $(BACNET_ROOT)/bacerror.c \
        $(BACNET_ROOT)/apdu.c \
-       $(BACNET_ROOT)/npdu.c
+       $(BACNET_ROOT)/npdu.c \
+       $(BACNET_ROOT)/version.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/demo/server/makefile.b32 b/bacnet-stack/demo/server/makefile.b32
index bdad0794..6c212cf8 100644
--- a/bacnet-stack/demo/server/makefile.b32
+++ b/bacnet-stack/demo/server/makefile.b32
@@ -76,7 +76,8 @@ SRCS = main.c \
        ..\..\reject.c \
        ..\..\bacerror.c \
        ..\..\apdu.c \
-       ..\..\npdu.c
+       ..\..\npdu.c \
+       ..\..\version.c
 
 OBJS = $(SRCS:.c=.obj)
 
diff --git a/bacnet-stack/demo/timesync/Makefile b/bacnet-stack/demo/timesync/Makefile
index d5b61706..2150aaac 100644
--- a/bacnet-stack/demo/timesync/Makefile
+++ b/bacnet-stack/demo/timesync/Makefile
@@ -71,7 +71,8 @@ SRCS = main.c \
        $(BACNET_ROOT)/reject.c \
        $(BACNET_ROOT)/bacerror.c \
        $(BACNET_ROOT)/apdu.c \
-       $(BACNET_ROOT)/npdu.c
+       $(BACNET_ROOT)/npdu.c \
+       $(BACNET_ROOT)/version.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/demo/timesync/makefile.b32 b/bacnet-stack/demo/timesync/makefile.b32
index c60d7b9d..a25fcd77 100644
--- a/bacnet-stack/demo/timesync/makefile.b32
+++ b/bacnet-stack/demo/timesync/makefile.b32
@@ -67,7 +67,8 @@ SRCS = main.c \
        $(BACNET_ROOT)\reject.c \
        $(BACNET_ROOT)\bacerror.c \
        $(BACNET_ROOT)\apdu.c \
-       $(BACNET_ROOT)\npdu.c
+       $(BACNET_ROOT)\npdu.c \
+       $(BACNET_ROOT)\version.c
 
 OBJS = $(SRCS:.c=.obj)
 
diff --git a/bacnet-stack/demo/ucov/Makefile b/bacnet-stack/demo/ucov/Makefile
index 6dd01ef5..47844beb 100644
--- a/bacnet-stack/demo/ucov/Makefile
+++ b/bacnet-stack/demo/ucov/Makefile
@@ -66,7 +66,8 @@ SRCS = main.c \
        $(BACNET_ROOT)/reject.c \
        $(BACNET_ROOT)/bacerror.c \
        $(BACNET_ROOT)/apdu.c \
-       $(BACNET_ROOT)/npdu.c
+       $(BACNET_ROOT)/npdu.c \
+       $(BACNET_ROOT)/version.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/demo/ucov/makefile.b32 b/bacnet-stack/demo/ucov/makefile.b32
index dc5b2429..9f5def3c 100644
--- a/bacnet-stack/demo/ucov/makefile.b32
+++ b/bacnet-stack/demo/ucov/makefile.b32
@@ -57,7 +57,8 @@ SRCS = main.c \
        ..\..\reject.c \
        ..\..\bacerror.c \
        ..\..\apdu.c \
-       ..\..\npdu.c
+       ..\..\npdu.c \
+       ..\..\version.c
 
 OBJS = $(SRCS:.c=.obj)
 
diff --git a/bacnet-stack/demo/whohas/Makefile b/bacnet-stack/demo/whohas/Makefile
index 7e458141..c36928f4 100644
--- a/bacnet-stack/demo/whohas/Makefile
+++ b/bacnet-stack/demo/whohas/Makefile
@@ -70,7 +70,8 @@ SRCS = main.c \
        $(BACNET_ROOT)/reject.c \
        $(BACNET_ROOT)/bacerror.c \
        $(BACNET_ROOT)/apdu.c \
-       $(BACNET_ROOT)/npdu.c
+       $(BACNET_ROOT)/npdu.c \
+       $(BACNET_ROOT)/version.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/demo/whohas/makefile.b32 b/bacnet-stack/demo/whohas/makefile.b32
index e0ff8157..74c9cc2a 100644
--- a/bacnet-stack/demo/whohas/makefile.b32
+++ b/bacnet-stack/demo/whohas/makefile.b32
@@ -61,7 +61,8 @@ SRCS = main.c \
        ..\..\reject.c \
        ..\..\bacerror.c \
        ..\..\apdu.c \
-       ..\..\npdu.c
+       ..\..\npdu.c \
+       ..\..\version.c
 
 OBJS = $(SRCS:.c=.obj)
 
diff --git a/bacnet-stack/demo/whois/Makefile b/bacnet-stack/demo/whois/Makefile
index af17e9d8..1aaf5045 100644
--- a/bacnet-stack/demo/whois/Makefile
+++ b/bacnet-stack/demo/whois/Makefile
@@ -71,7 +71,8 @@ SRCS = main.c \
        $(BACNET_ROOT)/reject.c \
        $(BACNET_ROOT)/bacerror.c \
        $(BACNET_ROOT)/apdu.c \
-       $(BACNET_ROOT)/npdu.c
+       $(BACNET_ROOT)/npdu.c \
+       $(BACNET_ROOT)/version.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/demo/whois/makefile.b32 b/bacnet-stack/demo/whois/makefile.b32
index c10c7fd5..d2e5c65d 100644
--- a/bacnet-stack/demo/whois/makefile.b32
+++ b/bacnet-stack/demo/whois/makefile.b32
@@ -65,7 +65,8 @@ SRCS = main.c \
        $(BACNET_ROOT)\reject.c \
        $(BACNET_ROOT)\bacerror.c \
        $(BACNET_ROOT)\apdu.c \
-       $(BACNET_ROOT)\npdu.c
+       $(BACNET_ROOT)\npdu.c \
+       $(BACNET_ROOT)\version.c
 
 OBJS = $(SRCS:.c=.obj)
 
diff --git a/bacnet-stack/demo/writefile/Makefile b/bacnet-stack/demo/writefile/Makefile
index 23a73acc..b97fe363 100644
--- a/bacnet-stack/demo/writefile/Makefile
+++ b/bacnet-stack/demo/writefile/Makefile
@@ -68,7 +68,8 @@ SRCS = main.c \
        $(BACNET_ROOT)/reject.c \
        $(BACNET_ROOT)/bacerror.c \
        $(BACNET_ROOT)/apdu.c \
-       $(BACNET_ROOT)/npdu.c
+       $(BACNET_ROOT)/npdu.c \
+       $(BACNET_ROOT)/version.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/demo/writefile/makefile.b32 b/bacnet-stack/demo/writefile/makefile.b32
index 26fa7ca6..4e6c3751 100644
--- a/bacnet-stack/demo/writefile/makefile.b32
+++ b/bacnet-stack/demo/writefile/makefile.b32
@@ -59,7 +59,8 @@ SRCS = main.c \
        ..\..\reject.c \
        ..\..\bacerror.c \
        ..\..\apdu.c \
-       ..\..\npdu.c
+       ..\..\npdu.c \
+       ..\..\version.c
 
 OBJS = $(SRCS:.c=.obj)
 
diff --git a/bacnet-stack/demo/writeprop/Makefile b/bacnet-stack/demo/writeprop/Makefile
index 7272789b..0f1570ea 100644
--- a/bacnet-stack/demo/writeprop/Makefile
+++ b/bacnet-stack/demo/writeprop/Makefile
@@ -68,7 +68,8 @@ SRCS = main.c \
        $(BACNET_ROOT)/reject.c \
        $(BACNET_ROOT)/bacerror.c \
        $(BACNET_ROOT)/apdu.c \
-       $(BACNET_ROOT)/npdu.c
+       $(BACNET_ROOT)/npdu.c \
+       $(BACNET_ROOT)/version.c
 
 OBJS = ${SRCS:.c=.o}
 
diff --git a/bacnet-stack/demo/writeprop/makefile.b32 b/bacnet-stack/demo/writeprop/makefile.b32
index 4ef466db..dd12061f 100644
--- a/bacnet-stack/demo/writeprop/makefile.b32
+++ b/bacnet-stack/demo/writeprop/makefile.b32
@@ -59,7 +59,8 @@ SRCS = main.c \
        ..\..\reject.c \
        ..\..\bacerror.c \
        ..\..\apdu.c \
-       ..\..\npdu.c
+       ..\..\npdu.c \
+       ..\..\version.c
 
 OBJS = $(SRCS:.c=.obj)
 
diff --git a/bacnet-stack/ports/win32/MAKEFILE.MAK b/bacnet-stack/ports/win32/MAKEFILE.MAK
index 2176c99c..5c4dab76 100644
--- a/bacnet-stack/ports/win32/MAKEFILE.MAK
+++ b/bacnet-stack/ports/win32/MAKEFILE.MAK
@@ -59,7 +59,8 @@ SRCS = main.c bip-init.c \
        ..\..\reject.c \
        ..\..\bacerror.c \
        ..\..\apdu.c \
-       ..\..\npdu.c
+       ..\..\npdu.c \
+       ..\..\version.c
 
 OBJS = $(SRCS:.c=.obj)
 
diff --git a/bacnet-stack/ports/win32/bacnet/bacnet.dsp b/bacnet-stack/ports/win32/bacnet/bacnet.dsp
index 4fb4deee..3a20345a 100644
--- a/bacnet-stack/ports/win32/bacnet/bacnet.dsp
+++ b/bacnet-stack/ports/win32/bacnet/bacnet.dsp
@@ -249,6 +249,10 @@ SOURCE=..\..\..\npdu.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\version.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\reject.c
 # End Source File
 # Begin Source File
@@ -417,6 +421,10 @@ SOURCE=..\..\..\npdu.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\version.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\reject.h
 # End Source File
 # Begin Source File