diff --git a/win32/config-msvc.mak.in b/win32/config-msvc.mak.in
index 3862f45323..b623a99491 100644
--- a/win32/config-msvc.mak.in
+++ b/win32/config-msvc.mak.in
@@ -46,6 +46,11 @@ AT_PLAT=aarch64
 AT_PLAT=i686
 !endif
 
+demo_sources = $(demos_base)
+!ifdef FONT_FEATURES_DEMO
+demo_sources = $(demo_sources) $(font_features_demo)
+!endif
+
 # Please do not change anything beneath this line unless maintaining the NMake Makefiles
 GTK_VERSION = @GTK_VERSION@
 
diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak
index c53c29f10e..b1bf65d2c4 100644
--- a/win32/create-lists-msvc.mak
+++ b/win32/create-lists-msvc.mak
@@ -99,3 +99,17 @@ NULL=
 
 !if [del /f /q resources_sources.mak]
 !endif
+
+!if [call create-lists.bat header demo_sources.mak demo_actual_sources]
+!endif
+
+!if [for %f in ($(demo_sources)) do @call create-lists.bat file demo_sources.mak ..\demos\gtk-demo\%f]
+!endif
+
+!if [call create-lists.bat footer demo_sources.mak]
+!endif
+
+!include demo_sources.mak
+
+!if [del /f /q demo_sources.mak]
+!endif
\ No newline at end of file
diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak
index 4fb0c563e6..dd8691d127 100644
--- a/win32/generate-msvc.mak
+++ b/win32/generate-msvc.mak
@@ -3,6 +3,7 @@
 # Items in here should not need to be edited unless
 # one is maintaining the NMake build files.
 
+!include ../demos/gtk-demo/demos-sources.mak
 !include config-msvc.mak
 !include create-lists-msvc.mak
 
@@ -193,6 +194,12 @@ all:	\
 	@echo Generating $@...
 	@$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\iconbrowser.gresource.xml
 
+regenerate-demos-h-win32: ..\demos\gtk-demo\geninclude.py $(demo_actual_sources)
+	@echo Regenerating demos.h.win32...
+	@-del ..\demos\gtk-demo\demos.h.win32
+	@cd ..\demos\gtk-demo
+	@$(PYTHON) geninclude.py demos.h.win32 $(demo_sources)
+
 # Remove the generated files
 clean:
 	@-del /f /q ..\demos\icon-browser\resources.c