diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 9f00615..6d6532b 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -13,7 +13,10 @@
                 "USE_GPSD=1",
                 "all"
             ],
-            "group": "build",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
             "problemMatcher": []
         },
         {
@@ -91,10 +94,7 @@
                 "ENABLE_DEBUG=1",
                 "USE_GPSD=1"
             ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
+            "group": "build",
             "problemMatcher": []
         }
     ]
diff --git a/README.md b/README.md
index c1d367d..bc147b0 100644
--- a/README.md
+++ b/README.md
@@ -158,6 +158,7 @@ The testing framwework used is Google Test.
 
 # 6. Version History
 ## 6.1. Version 1.0
+- [**Improvement**] Add version info to output of --version ([#56](https://github.com/F4FXL/DStarGateway/issues/56))
 - [**Improvement**] Automatically download hosts files on startup. It is also possible to specify custom hosts files to override hosts from the internet. Needs some configuration adjustement, see example.cfg. ([#50](https://github.com/F4FXL/DStarGateway/issues/50))
 - [**Improvement**] Limit log reporting ([#44](https://github.com/F4FXL/DStarGateway/issues/44))
 - [**Improvement**] Improve CI to include all variants of build configurations ([#40](https://github.com/F4FXL/DStarGateway/issues/40))
diff --git a/VersionInfo/Makefile b/VersionInfo/Makefile
index c6c5eed..cd9f95a 100644
--- a/VersionInfo/Makefile
+++ b/VersionInfo/Makefile
@@ -3,10 +3,12 @@ ifneq ("$(wildcard ../.git/index)","")
 	@echo "#pragma once" > /tmp/$@
 	@echo "#include <string>" >> /tmp/$@
 	@echo "const std::string gitversion(\"$(shell git rev-parse --short HEAD)\");" >> /tmp/$@
+	@echo "const std::string gitBranch(\"$(shell git branch --show-current)\");" >> /tmp/$@
 else
 	@echo "#pragma once" > /tmp/$@
 	@echo "#include <string>" >> /tmp/$@
 	@echo "const std::string gitversion(\"0000000\");" >> /tmp/$@
+	@echo "const std::string gitBranch(\"UNKNOWN BRANCH\");" >> /tmp/$@
 endif
 	@cmp -s /tmp/$@ $@; \
 	RETVAL=$$?; \
diff --git a/VersionInfo/Version.h b/VersionInfo/Version.h
index b3fa983..7d38885 100644
--- a/VersionInfo/Version.h
+++ b/VersionInfo/Version.h
@@ -28,5 +28,5 @@ const std::string PRODUCT_NAME("DStarGateway");
 const std::string VENDOR_NAME("Geoffrey Merck F4FXL / KC3FRA and Contributors");
 const std::string VERSION("1.0");
 const std::string LONG_VERSION = VERSION + "-" + gitversion;
-const std::string FULL_PRODUCT_NAME = PRODUCT_NAME + " v" + VERSION + "-" + gitversion;
+const std::string FULL_PRODUCT_NAME = PRODUCT_NAME + " v" + VERSION + "-" + gitversion + "-" + gitBranch;
 const std::string SHORT_PRODUCT_NAME = "DStarGW v" + VERSION + "-" + gitversion;