diff --git a/oscar/oscar.pro b/oscar/oscar.pro
index 41f5b8b2..6d950ce3 100644
--- a/oscar/oscar.pro
+++ b/oscar/oscar.pro
@@ -91,10 +91,13 @@ QMAKE_EXTRA_TARGETS += gitinfotarget
 
 QMAKE_TARGET_PRODUCT = OSCAR
 QMAKE_TARGET_COMPANY = The OSCAR Team
-QMAKE_TARGET_COPYRIGHT = © 2019 The OSCAR Team
+QMAKE_TARGET_COPYRIGHT = © 2019-2020 The OSCAR Team
 QMAKE_TARGET_DESCRIPTION = "OpenSource CPAP Analysis Reporter"
 _VERSION_FILE = $$cat(./VERSION)
 VERSION = $$section(_VERSION_FILE, '"', 1, 1)
+win32 {
+    VERSION=1.1.0.0
+}
 RC_ICONS = ./icons/logo.ico
 
 macx  {
diff --git a/oscar/update_gitinfo.bat b/oscar/update_gitinfo.bat
index 5675a1a7..f66a24ec 100755
--- a/oscar/update_gitinfo.bat
+++ b/oscar/update_gitinfo.bat
@@ -1,25 +1,43 @@
 @echo off
-setlocal
+setlocal EnableDelayedExpansion
 set DIR=%~dp0
 cd %DIR%
 
-if ('git rev-parse --git-dir') (
-  for /f %%i in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i
-  if "%GIT_BRANCH"=="HEAD" set GIT_BRANCH=""
-  for /f %%i in ('git rev-parse --short HEAD') do set GIT_REVISION=%%i
-  if ('git diff-index --quiet HEAD --') (
-    set GIT_REVISION=%GIT_REVISION%-plus
-  ) else (
-    for /f %%i in ('git describe --exact-match --tags') do set GIT_TAG=%%i
-  )
+for /f %%i in ('git rev-parse --git-dir') do set GIT_DIR=%%i
+if "%GIT_DIR%"=="" goto GitDone
+
+for /f %%i in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i
+if "%GIT_BRANCH%"=="HEAD" set GIT_BRANCH=""
+for /f %%i in ('git rev-parse --short HEAD') do set GIT_REVISION=%%i
+for /f %%i in ('git diff-index --quiet HEAD --') do set GIT_INDEX=%%i
+if "%GIT_INDEX%"=="" (
+  set GIT_REVISION=%GIT_REVISION%-plus
+  set GIT_TAG=
+  goto GitDone
 )
 
-echo // This is an auto generated file > %DIR%git_info.new
-if "%GIT_BRANCH"!=""  echo #define GIT_BRANCH "%GIT_BRANCH%" >> %DIR%git_info.new
-if "%GIT_REVISION!="" echo #define GIT_REVISION "%GIT_REVISION%" >> %DIR%git_info.new
-if "%GIT_TAG"!=""     echo #define GIT_TAG "%GIT_TAG%" >> %DIR%git_info.new
+for /f %%i in ('git describe --exact-match --tags') do set GIT_TAG=%%i
 
-fc %DIR%git_info.h %DIR%git_info.new >nul 2>nul && del /q %DIR%git_info.new || goto NewFile
+:GitDone
+
+@echo Update_gtinfo.bat: GIT_DIR=%GIT_DIR%, GIT_BRANCH=%GIT_BRANCH%, GIT_REVISION=%GIT_REVISION%, GIT_TAG=%GIT_TAG%
+
+echo // This is an auto generated file > %DIR%git_info.new
+
+if "%GIT_BRANCH%"=="" goto DoRevision
+  echo #define GIT_BRANCH "%GIT_BRANCH%" >> %DIR%git_info.new
+:DoRevision
+if "%GIT_REVISION%"=="" goto DoTag
+  echo #define GIT_REVISION "%GIT_REVISION%" >> %DIR%git_info.new
+:DoTag
+if "%GIT_TAG%"=="" goto DefinesDone
+  echo #define GIT_TAG "%GIT_TAG%" >> %DIR%git_info.new
+:DefinesDone
+
+:::type %DIR%git_info.new
+:::set
+
+fc %DIR%git_info.h %DIR%git_info.new 1>nul 2>nul && del /q %DIR%git_info.new || goto NewFile
 goto AllDone
 
 :NewFile