diff --git a/.vscode/launch.json b/.vscode/launch.json
index 14711bb..03f8b49 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -76,6 +76,30 @@
                 }
             ]
         },
+        {
+            "name": "(gdb) dgwtimeserver",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/DGWTimeServer/dgwtimeserver",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Activer l'impression en mode Pretty pour gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                },
+                {
+                    "description": "Définir la version désassemblage sur Intel",
+                    "text": "-gdb-set disassembly-flavor intel",
+                    "ignoreFailures": true
+                }
+            ]
+        },
         {
             "name": "(gdb) dgwvoicetransmit",
             "type": "cppdbg",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 6066b4b..0545c42 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -13,10 +13,7 @@
                 "USE_GPSD=1",
                 "all"
             ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
+            "group": "build",
             "problemMatcher": []
         },
         {
@@ -58,6 +55,22 @@
             "group": "build",
             "problemMatcher": []
         },
+        {
+            "label": "Build DGWTimeServer",
+            "type": "shell",
+            "command": "make",
+            "args": [
+                "-j3",
+                "ENABLE_DEBUG=1",
+                "USE_GPSD=1",
+                "DGWTimeServer/dgwtimeserver"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": []
+        },
         {
             "label": "Build DGWVoiceTransmit",
             "type": "shell",
diff --git a/DGWTimeServer/Makefile b/DGWTimeServer/Makefile
new file mode 100644
index 0000000..4ea197d
--- /dev/null
+++ b/DGWTimeServer/Makefile
@@ -0,0 +1,22 @@
+SRCS = $(wildcard *.cpp)
+OBJS = $(SRCS:.cpp=.o)
+DEPS = $(SRCS:.cpp=.d)
+
+dgwtimeserver: ../VersionInfo/GitVersion.h $(OBJS) ../DStarBase/DStarBase.a ../BaseCommon/BaseCommon.a
+	$(CC) $(CPPFLAGS) -o dgwtimeserver $(OBJS) ../DStarBase/DStarBase.a ../BaseCommon/BaseCommon.a $(LDFLAGS)
+
+%.o : %.cpp
+	$(CC) -I../BaseCommon -I../DStarBase -I../VersionInfo $(CPPFLAGS) -MMD -MD -c $< -o $@
+
+.PHONY clean:
+clean:
+	$(RM) *.o *.d dgwtimeserver
+
+.PHONY install:
+install: dgwtimeserver
+# copy executable
+	@cp -f dgwtimeserver $(BIN_DIR)
+
+../BaseCommon/BaseCommon.a:
+../DStarBase/DStarBase.a:
+../VersionInfo/GitVersion.h:
diff --git a/Makefile b/Makefile
index 7a131cb..d48596c 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ endif
 
 
 .PHONY: all
-all: DStarGateway/dstargateway  DGWRemoteControl/dgwremotecontrol DGWTextTransmit/dgwtexttransmit DGWVoiceTransmit/dgwvoicetransmit #tests
+all: DStarGateway/dstargateway  DGWRemoteControl/dgwremotecontrol DGWTextTransmit/dgwtexttransmit DGWTimeServer/dgwtimeserver DGWVoiceTransmit/dgwvoicetransmit #tests
 
 APRS/APRS.a: BaseCommon/BaseCommon.a FORCE
 	$(MAKE) -C APRS
@@ -63,6 +63,9 @@ DGWRemoteControl/dgwremotecontrol: VersionInfo/GitVersion.h $(OBJS) DStarBase/DS
 DGWTextTransmit/dgwtexttransmit: VersionInfo/GitVersion.h $(OBJS) DStarBase/DStarBase.a BaseCommon/BaseCommon.a FORCE
 	$(MAKE) -C DGWTextTransmit
 
+DGWTimeServer/dgwtimeserver: VersionInfo/GitVersion.h $(OBJS) DStarBase/DStarBase.a BaseCommon/BaseCommon.a FORCE
+	$(MAKE) -C DGWTimeServer
+
 DGWVoiceTransmit/dgwvoicetransmit: VersionInfo/GitVersion.h $(OBJS) DStarBase/DStarBase.a BaseCommon/BaseCommon.a FORCE
 	$(MAKE) -C DGWVoiceTransmit
 
@@ -99,6 +102,7 @@ install : DStarGateway/dstargateway DGWRemoteControl/dgwremotecontrol
 # install accessories
 	$(MAKE) -C DGWRemoteControl install
 	$(MAKE) -C DGWTextTransmit install
+	$(MAKE) -C DGWTimeServer install
 	$(MAKE) -C DGWVoiceTransmit install
 	
 # create user for daemon