diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog
index f535e58224d4efc1ed2cebff6b95ff4caad52238..c163312bb199e307e6bc884daed6a31f8e27b981 100644
--- a/smartmontools/ChangeLog
+++ b/smartmontools/ChangeLog
@@ -2,6 +2,8 @@ $Id$
 
 2022-04-30  Christian Franke  <franke@computer.org>
 
+	Makefile.am: Update config-vc and *clean-vc targets for MSVC16/17.
+
 	os_win32/vc17: Copy from vc16 and change for MSVC17 (VS2022).
 
 	os_win32/vc16/*: Add configurations Debug-static and Release-static.
diff --git a/smartmontools/Makefile.am b/smartmontools/Makefile.am
index 06bad4ac0df5cd9ef56f28943cf324cd54cfa75e..4ba1cbfbe92cc276e643a637dbcba66f76dc0a49 100644
--- a/smartmontools/Makefile.am
+++ b/smartmontools/Makefile.am
@@ -1050,19 +1050,19 @@ update-smart-drivedb.ps1: os_win32/update-smart-drivedb.ps1.in config.status
 	$(SHELL) ./config.status --file=$@:$<
 
 # MSVC Version to change in make command line
-vc = 16
+vc = 17
 vcver = $(vc)
 
 .PHONY: check-vc-version clean-vc config-vc distclean-vc maintainer-clean-vc
 
 check-vc-version:
 	@case '$(vcver)' in \
-	  14|15|16) test -d '$(srcdir)/os_win32/vc$(vcver)' || \
+	  16|17) test -d '$(srcdir)/os_win32/vc$(vcver)' || \
 	    { echo '$(srcdir)/os_win32/vc$(vcver): Not found (not included in src tarball)' >&2; exit 1; } ;; \
-	  *) echo 'Usage: $(MAKE) vc=14|15|16 config-vc clean-vc distclean-vc maintainer-clean-vc'; exit 1 ;; \
+	  *) echo 'Usage: $(MAKE) vc=16|17 config-vc clean-vc distclean-vc maintainer-clean-vc'; exit 1 ;; \
 	esac
 
-# Build os_win32/vcNN/{config.h,smart*.rc,svnversion.h} for MSVC14/15/16 from MinGW files
+# Build os_win32/vcNN/{config.h,smart*.rc,svnversion.h} for MSVCNN from MinGW files
 
 CONFIG_VC_FILES = \
         $(srcdir)/os_win32/vc$(vcver)/config.h \
@@ -1086,16 +1086,15 @@ $(srcdir)/os_win32/vc$(vcver)/smartctl_res.rc: smartctl_res.rc
 $(srcdir)/os_win32/vc$(vcver)/smartd_res.rc: smartd_res.rc
 	sed '/^1 24 /d' $< > $@
 
-# VC14: smartmontools.VC.*, VC15/16: .vs/smartmontools/vNN/*
 clean-vc: check-vc-version
-	rm -f $(srcdir)/os_win32/vc$(vcver)/smartmontools.VC.VC.opendb
-	rm -f $(srcdir)/os_win32/vc$(vcver)/smartmontools.VC.db
 	rm -f $(srcdir)/os_win32/vc$(vcver)/.vs/smartmontools/v$(vcver)/Browse.VC.opendb
 	rm -f $(srcdir)/os_win32/vc$(vcver)/.vs/smartmontools/v$(vcver)/*.VC.db*
 	rm -rf $(srcdir)/os_win32/vc$(vcver)/.vs/smartmontools/v$(vcver)/ipch
 	rm -f $(srcdir)/os_win32/vc$(vcver)/syslogevt.h
 	rm -rf $(srcdir)/os_win32/vc$(vcver)/Debug
+	rm -rf $(srcdir)/os_win32/vc$(vcver)/Debug-static
 	rm -rf $(srcdir)/os_win32/vc$(vcver)/Release
+	rm -rf $(srcdir)/os_win32/vc$(vcver)/Release-static
 	rm -rf $(srcdir)/os_win32/vc$(vcver)/x64
 
 distclean-vc: clean-vc