diff --git a/platforms/win32/winbareos-nsi.spec b/platforms/win32/winbareos-nsi.spec
index 4ec1baa3547..0837a7ca684 100644
--- a/platforms/win32/winbareos-nsi.spec
+++ b/platforms/win32/winbareos-nsi.spec
@@ -111,7 +111,7 @@ for file in \
    bareos-fd.exe \
    bareos-sd.exe \
    bareos-dir.exe \
-   dbcheck.exe \
+   bareos-dbcheck.exe \
    bconsole.exe \
    bsmtp.exe \
    btape.exe \
diff --git a/platforms/win32/winbareos.nsi b/platforms/win32/winbareos.nsi
index 8fae7aa9b37..4f0611c72b2 100644
--- a/platforms/win32/winbareos.nsi
+++ b/platforms/win32/winbareos.nsi
@@ -629,7 +629,7 @@ SectionIn 2
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
   File "bareos-dir.exe"
-  File "dbcheck.exe"
+  File "bareos-dbcheck.exe"
   File "bsmtp.exe"
   File "libbareoscats.dll"
   File "libbareoscats-postgresql.dll"
@@ -1680,7 +1680,7 @@ ConfDeleteSkip:
   Delete "$INSTDIR\bareos-fd.exe"
   Delete "$INSTDIR\bareos-sd.exe"
   Delete "$INSTDIR\bareos-dir.exe"
-  Delete "$INSTDIR\dbcheck.exe"
+  Delete "$INSTDIR\bareos-dbcheck.exe"
   Delete "$INSTDIR\btape.exe"
   Delete "$INSTDIR\bls.exe"
   Delete "$INSTDIR\bextract.exe"
diff --git a/platforms/win32/winbareos32.spec b/platforms/win32/winbareos32.spec
index 01cff5e134d..79e43926689 100644
--- a/platforms/win32/winbareos32.spec
+++ b/platforms/win32/winbareos32.spec
@@ -129,7 +129,7 @@ cp qt-tray-monitor/bareos-tray-monitor.exe \
    stored/bls.exe \
    stored/bextract.exe \
    dird/bareos-dir.exe \
-   dird/dbcheck.exe \
+   dird/bareos-dbcheck.exe \
    tools/bsmtp.exe \
    stored/libbareossd*.dll \
    cats/libbareoscats*.dll \
diff --git a/platforms/win32/winbareos64.spec b/platforms/win32/winbareos64.spec
index dff49e7d6c3..08b082d57c8 100644
--- a/platforms/win32/winbareos64.spec
+++ b/platforms/win32/winbareos64.spec
@@ -129,7 +129,7 @@ cp qt-tray-monitor/bareos-tray-monitor.exe \
    stored/bls.exe \
    stored/bextract.exe \
    dird/bareos-dir.exe \
-   dird/dbcheck.exe \
+   dird/bareos-dbcheck.exe \
    tools/bsmtp.exe \
    stored/libbareossd*.dll \
    cats/libbareoscats*.dll \
diff --git a/src/win32/dird/Makefile b/src/win32/dird/Makefile
index 1f0748ffc55..c8a7a97f730 100644
--- a/src/win32/dird/Makefile
+++ b/src/win32/dird/Makefile
@@ -55,21 +55,21 @@ WINDRESOBJS = $(WINDRESSRCS:.rc=.o)
 DBCHKRESSRCS = dbcheckres.rc
 DBCHKRESOBJS = $(DBCHKRESSRCS:.rc=.o)
 
-all: bareos-dir.exe dbcheck.exe
+all: bareos-dir.exe bareos-dbcheck.exe
 
 bareos-dir.exe: DLL_USAGE = -DUSING_DLL
 bareos-dir.exe: $(SVROBJS) $(WINDRESOBJS)
 	$(CXX) $(LDFLAGS_WINAPP) $(SVROBJS) $(WINDRESOBJS) $(LDLIBS) -o $@
 
-dbcheck.exe: DLL_USAGE = -DUSING_DLL
-dbcheck.exe: $(DBCHKOBJS) $(DBCHKRESOBJS)
+bareos-dbcheck.exe: DLL_USAGE = -DUSING_DLL
+bareos-dbcheck.exe: $(DBCHKOBJS) $(DBCHKRESOBJS)
 	$(CXX) $(LDFLAGS_CONS) $(DBCHKOBJS) $(LDLIBS) $(DBCHKRESOBJS) -o $@
 
 clean:
 	rm -f *.o
 
 distclean:: clean
-	rm -f bareos-dir.exe dbcheck.exe
+	rm -f bareos-dir.exe bareos-dbcheck.exe
 
 # inference rules
 .c.o:
diff --git a/src/win32/dird/dbcheckres.rc.in b/src/win32/dird/dbcheckres.rc.in
index 34a64f3c75b..6e11e4be96e 100644
--- a/src/win32/dird/dbcheckres.rc.in
+++ b/src/win32/dird/dbcheckres.rc.in
@@ -10,8 +10,8 @@ BEGIN
       VALUE "CompanyName", "Bareos GmbH & Co. KG"
       VALUE "FileDescription", "Bareos Database Check"
       VALUE "FileVersion", @VERSION@
-      VALUE "InternalName", "dbcheck.exe"
-      VALUE "OriginalFilename", "dbcheck.exe"
+      VALUE "InternalName", "bareos-dbcheck.exe"
+      VALUE "OriginalFilename", "bareos-dbcheck.exe"
       VALUE "ProductName", "Bareos Database Check"
       VALUE "ProductVersion", @VERSION@
       VALUE "LegalCopyright", "Copyright 2000-2012 Free Software Foundation Europe e.V. "