diff --git a/MSIBuild/.gitignore b/MSIBuild/.gitignore
new file mode 100644
index 0000000..80ea676
--- /dev/null
+++ b/MSIBuild/.gitignore
@@ -0,0 +1,9 @@
+/*-1.idt
+/*-2.idt
+/*-2.idtx
+/*.Binary-1
+/*.Binary-2
+/*.Icon-1
+/*.Icon-2
+/*.lst
+/*.msm
diff --git a/MSIBuild/Makefile b/MSIBuild/Makefile
new file mode 100644
index 0000000..157d9d0
--- /dev/null
+++ b/MSIBuild/Makefile
@@ -0,0 +1,102 @@
+#
+#    Copyright 1991-2016 Amebis
+#
+#    This file is part of ZRCola.
+#
+#    ZRCola is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    ZRCola is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+#
+
+!INCLUDE "..\..\..\MSI\include\MSIBuildCfg.mak"
+
+!IFNDEF WXEXTENDBINDIR
+!ERROR Parameter WXEXTENDBINDIR is undefined.
+!ENDIF
+
+!IFNDEF WXEXTENDLOCDIR
+!ERROR Parameter WXEXTENDLOCDIR is undefined.
+!ENDIF
+
+
+######################################################################
+# Component
+
+All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Component	ComponentId	Directory_	Attributes	Condition	KeyPath
+s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
+Component	Component
+!IF "$(PLAT)" == "Win32"
+compwxExtend.dll.Win32	{CF0DA67E-4D98-4059-9ECA-CB0DE44E92EB}	$(WXEXTENDBINDIR)	0		filewxExtend.dll.Win32
+!ENDIF
+!IF "$(PLAT)" == "x64"
+compwxExtend.dll.x64	{02F1022D-AA80-4FCA-A6F2-C576C405E1B2}	$(WXEXTENDBINDIR)	256		filewxExtend.dll.x64
+!ENDIF
+compwxExtend.mo.sl	{60770F71-A7B4-4B20-9535-726049A5D412}	WXEXTENDLOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filewxExtend.mo.sl
+<<NOKEEP
+
+
+######################################################################
+# Directory
+
+All :: "$(LANG).$(PLAT).$(CFG).Directory-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).Directory-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Directory	Directory_Parent	DefaultDir
+s$(MSIBUILD_LENGTH_ID)	S$(MSIBUILD_LENGTH_ID)	l255
+Directory	Directory
+WXEXTENDLOCSLSIDIR	$(WXEXTENDLOCDIR)	sl
+<<NOKEEP
+
+
+######################################################################
+# File
+
+All :: "$(LANG).$(PLAT).$(CFG).File-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l255	i4	S$(MSIBUILD_LENGTH_ID)	S20	I2	i2
+File	File
+!IF "$(PLAT)" == "Win32"
+!IF "$(CFG)" == "Release"
+filewxExtend.dll.Win32	compwxExtend.dll.Win32	WXEXTE~2.DLL|wxExtend10u_vc100.dll	0		0	1536	1
+!ENDIF
+!IF "$(CFG)" == "Debug"
+filewxExtend.dll.Win32	compwxExtend.dll.Win32	WXEXTE~4.DLL|wxExtend10ud_vc100.dll	0		0	1536	1
+!ENDIF
+!ENDIF
+!IF "$(PLAT)" == "x64"
+!IF "$(CFG)" == "Release"
+filewxExtend.dll.x64	compwxExtend.dll.x64	WXEXTE~6.DLL|wxExtend10u_vc100_x64.dll	0		0	1536	1
+!ENDIF
+!IF "$(CFG)" == "Debug"
+filewxExtend.dll.x64	compwxExtend.dll.x64	WXEXTE~8.DLL|wxExtend10ud_vc100_x64.dll	0		0	1536	1
+!ENDIF
+!ENDIF
+filewxExtend.mo.sl	compwxExtend.mo.sl	WXEXTE~1.MO|wxExtend.mo	0		0	0	1
+<<NOKEEP
+
+
+######################################################################
+# Build MSM module!
+######################################################################
+
+!INCLUDE "..\..\..\MSI\MSIBuild\MSM.mak"