diff --git a/bacnet-stack/demo/server/makefile.b32 b/bacnet-stack/demo/server/makefile.b32
index bddf6b22..0601b834 100644
--- a/bacnet-stack/demo/server/makefile.b32
+++ b/bacnet-stack/demo/server/makefile.b32
@@ -30,6 +30,7 @@ SRCS = server.c \
        ..\..\demo\handler\h_arf.c  \
        ..\..\demo\handler\h_rd.c  \
        ..\..\demo\handler\h_dcc.c  \
+       ..\..\demo\handler\h_ts.c  \
        ..\..\demo\handler\h_whohas.c  \
        ..\..\demo\handler\s_ihave.c  \
        ..\..\bacdcode.c \
@@ -48,6 +49,7 @@ SRCS = server.c \
        ..\..\awf.c \
        ..\..\rd.c \
        ..\..\dcc.c \
+       ..\..\timesync.c \
        ..\..\demo\object\bacfile.c \
        ..\..\demo\object\device.c \
        ..\..\demo\object\ai.c \
diff --git a/bacnet-stack/demo/server/server.c b/bacnet-stack/demo/server/server.c
index f57f5c5d..28c4b9ce 100644
--- a/bacnet-stack/demo/server/server.c
+++ b/bacnet-stack/demo/server/server.c
@@ -71,6 +71,10 @@ static void Init_Service_Handlers(void)
         handler_atomic_read_file);
     apdu_set_confirmed_handler(SERVICE_CONFIRMED_REINITIALIZE_DEVICE,
         handler_reinitialize_device);
+    apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_UTC_TIME_SYNCHRONIZATION,
+        handler_timesync_utc);
+    apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_TIME_SYNCHRONIZATION,
+        handler_timesync);
     /* handle communication so we can shutup when asked */
     apdu_set_confirmed_handler
         (SERVICE_CONFIRMED_DEVICE_COMMUNICATION_CONTROL,