diff --git a/src/Makefile.mak b/src/Makefile.mak
index 7adccab7..eb0ac04f 100644
--- a/src/Makefile.mak
+++ b/src/Makefile.mak
@@ -8,8 +8,13 @@ SUBDIRS = common scconf pkcs15init libopensc pkcs11 tools tests
 SUBDIRS = $(SUBDIRS) cardmod
 !ENDIF
 
+!IF "$(WIX_MSI_DEF)" == "/DBUILD_MSI"
+SUBDIRS = $(SUBDIRS) "$(TOPDIR)\win32\opensc-msi"
+!ENDIF
+
 all::
 
 all depend install clean::
 	@for %i in ( $(SUBDIRS) ) do \
-        	@cmd /c "cd %i && $(MAKE) /nologo /f Makefile.mak $@"
+		@cmd /c "cd %i && $(MAKE) /nologo /f Makefile.mak $@"
+