diff --git a/build/win32/create-lists-msvc.mak b/build/win32/create-lists-msvc.mak
index 62e2914413..914be31951 100644
--- a/build/win32/create-lists-msvc.mak
+++ b/build/win32/create-lists-msvc.mak
@@ -110,6 +110,25 @@ NULL=
 !if [call create-lists.bat footer gtk_sources.mak]
 !endif
 
+# Get actual paths of demo sources in gtk-demo
+!if [call create-lists.bat header gtk_sources.mak GTK_DEMO_BASE_SRCS]
+!endif
+
+!if [for %f in ($(demos_base:		=)) do @call create-lists.bat file gtk_sources.mak ..\..\demos\gtk-demo\%f]
+!endif
+
+!if [call create-lists.bat footer gtk_sources.mak]
+!endif
+
+!if [call create-lists.bat header gtk_sources.mak GTK_FONT_FEATURE_DEMO_SRCS]
+!endif
+
+!if [for %f in ($(font_features_demo:		=)) do @call create-lists.bat file gtk_sources.mak ..\..\demos\gtk-demo\%f]
+!endif
+
+!if [call create-lists.bat footer gtk_sources.mak]
+!endif
+
 !include gtk_sources.mak
 
 !if [del /f /q gtk_sources.mak]
diff --git a/build/win32/generate-msvc.mak b/build/win32/generate-msvc.mak
index db689a2a11..c8b4fb7edd 100644
--- a/build/win32/generate-msvc.mak
+++ b/build/win32/generate-msvc.mak
@@ -3,9 +3,12 @@
 # Items in here should not need to be edited unless
 # one is maintaining the NMake build files.
 
+!include ..\..\demos\gtk-demo\Makefile.inc
+
 !include config-msvc.mak
 !include create-lists-msvc.mak
 
+
 # Copy the pre-defined gdkconfig.h.[win32|win32_broadway]
 !if "$(CFG)" == "release" || "$(CFG)" == "Release"
 GDK_OLD_CFG = debug
@@ -23,6 +26,12 @@ GDK_DEL_CONFIG = broadway
 GDK_CONFIG_TEMPLATE = ..\..\gdk\gdkconfig.h.win32
 !endif
 
+gtk_demo_sources = $(GTK_DEMO_BASE_SRCS)
+
+!ifdef HARFBUZZ
+gtk_demo_sources = $(gtk_demo_sources) $(GTK_FONT_FEATURE_DEMO_SRCS)
+!endif
+
 GDK_MARSHALERS_FLAGS = --prefix=_gdk_marshal --valist-marshallers
 GDK_RESOURCES_ARGS = ..\..\gdk\gdk.gresource.xml --target=$@ --sourcedir=..\..\gdk --c-name _gdk --manual-register
 GTK_MARSHALERS_FLAGS = --prefix=_gtk_marshal --valist-marshallers
@@ -213,7 +222,7 @@ all:	\
 	@echo #undef G_ENABLE_DEBUG> $@.tmp
 	@$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --body $** >> $@.tmp
 	@move $@.tmp $@
-	
+
 ..\..\gtk\mkenums-msvc.mak:
 	@echo !include a11y\Makefile.inc>$@
 	@echo !include deprecated\Makefile.inc>>$@
@@ -261,6 +270,12 @@ all:	\
 	@echo Generating $@...
 	@$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\iconbrowser.gresource.xml
 
+..\..\demos\gtk-demo\demos.h.win32: ..\..\demos\gtk-demo\geninclude.pl.in $(gtk_demo_sources)
+	@echo Re-generating $@...
+	@cd $(@D)
+	@$(PERL) geninclude.pl.in $(gtk_demo_sources:..\..\demos\gtk-demo\=)> $@
+	@cd $(MAKEDIR)
+
 # Remove the generated files
 clean:
 	@-del /f /q ..\..\demos\icon-browser\resources.c