diff --git a/reactos/subsys/system/msiexec/Makefile b/reactos/subsys/system/msiexec/Makefile
new file mode 100644
index 00000000000..889e5c4868f
--- /dev/null
+++ b/reactos/subsys/system/msiexec/Makefile
@@ -0,0 +1,36 @@
+#
+
+PATH_TO_TOP = ../../..
+
+TARGET_TYPE = program
+
+TARGET_APPTYPE =  windows
+
+TARGET_NAME = msiexec
+
+TARGET_CFLAGS = -I$(PATH_TO_TOP)/include/wine -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -D__USE_W32API
+
+TARGET_OBJECTS = msiexec.o
+
+TARGET_SDKLIBS = wine.a \
+	ntdll.a \
+	kernel32.a \
+	user32.a \
+	advapi32.a \
+	ole32.a \
+	wine_uuid.a \
+	msi.a
+
+TARGET_RC_SRCS = version.rc
+
+TARGET_RC_BINSRC = 
+
+TARGET_RC_BINARIES = 
+
+default: all
+DEP_OBJECTS = $(TARGET_OBJECTS)
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+include $(TOOLS_PATH)/depend.mk
diff --git a/reactos/subsys/system/msiexec/Makefile.in b/reactos/subsys/system/msiexec/Makefile.in
new file mode 100644
index 00000000000..8b7cf50f491
--- /dev/null
+++ b/reactos/subsys/system/msiexec/Makefile.in
@@ -0,0 +1,16 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = msiexec.exe
+APPMODE   = -mconsole
+IMPORTS   = msi ole32 advapi32 user32 kernel32
+
+C_SRCS = \
+	msiexec.c
+
+RC_SRCS = version.rc
+
+@MAKE_PROG_RULES@
+
+### Dependencies:
diff --git a/reactos/subsys/system/msiexec/msiexec.c b/reactos/subsys/system/msiexec/msiexec.c
new file mode 100644
index 00000000000..5c0054ba982
--- /dev/null
+++ b/reactos/subsys/system/msiexec/msiexec.c
@@ -0,0 +1,912 @@
+/*
+ * msiexec.exe implementation
+ *
+ * Copyright 2004 Vincent Béron
+ * Copyright 2005 Mike McCormack
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <windows.h>
+#include <msi.h>
+#include <objbase.h>
+#include <stdio.h>
+
+#include "msiexec.h"
+
+#include "wine/debug.h"
+#include "wine/unicode.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msiexec);
+
+struct string_list
+{
+	struct string_list *next;
+	WCHAR str[1];
+};
+
+static const char UsageStr[] =
+"Usage:\n"
+"  Install a product:\n"
+"    msiexec {package|productcode} [property]\n"
+"    msiexec /i {package|productcode} [property]\n"
+"    msiexec /a package [property]\n"
+"  Repair an installation:\n"
+"    msiexec /f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n"
+"  Uninstall a product:\n"
+"    msiexec /x {package|productcode} [property]\n"
+"  Advertise a product:\n"
+"    msiexec /j[u|m] package [/t transform] [/g languageid]\n"
+"    msiexec {u|m} package [/t transform] [/g languageid]\n"
+"  Apply a patch:\n"
+"    msiexec /p patchpackage [property]\n"
+"    msiexec /p patchpackage /a package [property]\n"
+"  Modifiers for above operations:\n"
+"    msiexec /l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n"
+"    msiexec /q{|n|b|r|f|n+|b+|b-}\n"
+"  Register a module:\n"
+"    msiexec /y module\n"
+"  Unregister a module:\n"
+"    msiexec /z module\n"
+"  Display usage and copyright:\n"
+"    msiexec {/h|/?}\n"
+"NOTE: Product code on commandline unimplemented as of yet\n"
+"\n"
+"Copyright 2004 Vincent Béron\n";
+
+static const WCHAR ActionAdmin[] = {
+   'A','C','T','I','O','N','=','A','D','M','I','N',' ',0 };
+static const WCHAR RemoveAll[] = {
+   'R','E','M','O','V','E','=','A','L','L',' ',0 };
+
+static const WCHAR InstallRunOnce[] = {
+   'S','o','f','t','w','a','r','e','\\',
+   'M','i','c','r','o','s','o','f','t','\\',
+   'W','i','n','d','o','w','s','\\',
+   'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
+   'I','n','s','t','a','l','l','e','r','\\',
+   'R','u','n','O','n','c','e','E','n','t','r','i','e','s',0};
+
+static void ShowUsage(int ExitCode)
+{
+	printf(UsageStr);
+	ExitProcess(ExitCode);
+}
+
+static BOOL IsProductCode(LPWSTR str)
+{
+	GUID ProductCode;
+
+	if(lstrlenW(str) != 38)
+		return FALSE;
+	return ( (CLSIDFromString(str, &ProductCode) == NOERROR) );
+
+}
+
+static VOID StringListAppend(struct string_list **list, LPCWSTR str)
+{
+	struct string_list *entry;
+	DWORD size;
+
+	size = sizeof *entry + lstrlenW(str) * sizeof (WCHAR);
+	entry = HeapAlloc(GetProcessHeap(), 0, size);
+	if(!entry)
+	{
+		WINE_ERR("Out of memory!\n");
+		ExitProcess(1);
+	}
+	lstrcpyW(entry->str, str);
+	entry->next = NULL;
+
+	/*
+	 * Ignoring o(n^2) time complexity to add n strings for simplicity,
+	 *  add the string to the end of the list to preserve the order.
+	 */
+	while( *list )
+		list = &(*list)->next;
+	*list = entry;
+}
+
+static LPWSTR build_properties(struct string_list *property_list)
+{
+	struct string_list *list;
+	LPWSTR ret, p, value;
+	DWORD len;
+	BOOL needs_quote;
+
+	if(!property_list)
+		return NULL;
+
+	/* count the space we need */
+	len = 1;
+	for(list = property_list; list; list = list->next)
+		len += lstrlenW(list->str) + 3;
+
+	ret = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
+
+	/* add a space before each string, and quote the value */
+	p = ret;
+	for(list = property_list; list; list = list->next)
+	{
+		value = strchrW(list->str,'=');
+		if(!value)
+			continue;
+		len = value - list->str;
+		*p++ = ' ';
+		strncpyW(p, list->str, len);
+		p += len;
+		*p++ = '=';
+
+		/* check if the value contains spaces and maybe quote it */
+		value++;
+		needs_quote = strchrW(value,' ') ? 1 : 0;
+		if(needs_quote)
+			*p++ = '"';
+		len = lstrlenW(value);
+		strncpyW(p, value, len);
+		p += len;
+		if(needs_quote)
+			*p++ = '"';
+	}
+	*p = 0;
+
+	WINE_TRACE("properties -> %s\n", wine_dbgstr_w(ret) );
+
+	return ret;
+}
+
+static LPWSTR build_transforms(struct string_list *transform_list)
+{
+	struct string_list *list;
+	LPWSTR ret, p;
+	DWORD len;
+
+	/* count the space we need */
+	len = 1;
+	for(list = transform_list; list; list = list->next)
+		len += lstrlenW(list->str) + 1;
+
+	ret = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
+
+	/* add all the transforms with a semicolon between each one */
+	p = ret;
+	for(list = transform_list; list; list = list->next)
+	{
+		len = lstrlenW(list->str);
+		lstrcpynW(p, list->str, len );
+		p += len;
+		if(list->next)
+			*p++ = ';';
+	}
+	*p = 0;
+
+	return ret;
+}
+
+static DWORD msi_atou(LPCWSTR str)
+{
+	DWORD ret = 0;
+	while(*str >= '0' && *str <= '9')
+	{
+		ret *= 10;
+		ret += (*str - '0');
+		str++;
+	}
+	return 0;
+}
+
+static LPWSTR msi_strdup(LPCWSTR str)
+{
+	DWORD len = lstrlenW(str)+1;
+	LPWSTR ret = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len);
+	lstrcpyW(ret, str);
+	return ret;
+}
+
+/* str1 is the same as str2, ignoring case */
+static BOOL msi_strequal(LPCWSTR str1, LPCSTR str2)
+{
+	DWORD len, ret;
+	LPWSTR strW;
+
+	len = MultiByteToWideChar( CP_ACP, 0, str2, -1, NULL, 0);
+	if( !len )
+		return TRUE;
+	if( lstrlenW(str1) != (len-1) )
+		return TRUE;
+	strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len);
+	MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len);
+	ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len, strW, len);
+	HeapFree(GetProcessHeap(), 0, strW);
+	return (ret != CSTR_EQUAL);
+}
+
+/* str2 is at the beginning of str1, ignoring case */
+static BOOL msi_strprefix(LPCWSTR str1, LPCSTR str2)
+{
+	DWORD len, ret;
+	LPWSTR strW;
+
+	len = MultiByteToWideChar( CP_ACP, 0, str2, -1, NULL, 0);
+	if( !len )
+		return TRUE;
+	if( lstrlenW(str1) < (len-1) )
+		return TRUE;
+	strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len);
+	MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len);
+	ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len-1, strW, len-1);
+	HeapFree(GetProcessHeap(), 0, strW);
+	return (ret != CSTR_EQUAL);
+}
+
+static VOID *LoadProc(LPCWSTR DllName, LPCSTR ProcName, HMODULE* DllHandle)
+{
+	VOID* (*proc)(void);
+
+	*DllHandle = LoadLibraryExW(DllName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+	if(!*DllHandle)
+	{
+		fprintf(stderr, "Unable to load dll %s\n", wine_dbgstr_w(DllName));
+		ExitProcess(1);
+	}
+	proc = (VOID *) GetProcAddress(*DllHandle, ProcName);
+	if(!proc)
+	{
+		fprintf(stderr, "Dll %s does not implement function %s\n",
+			wine_dbgstr_w(DllName), ProcName);
+		FreeLibrary(*DllHandle);
+		ExitProcess(1);
+	}
+
+	return proc;
+}
+
+static DWORD DllRegisterServer(LPCWSTR DllName)
+{
+	HRESULT hr;
+	DLLREGISTERSERVER pfDllRegisterServer = NULL;
+	HMODULE DllHandle = NULL;
+
+	pfDllRegisterServer = LoadProc(DllName, "DllRegisterServer", &DllHandle);
+
+	hr = pfDllRegisterServer();
+	if(FAILED(hr))
+	{
+		fprintf(stderr, "Failed to register dll %s\n", wine_dbgstr_w(DllName));
+		return 1;
+	}
+	printf("Successfully registered dll %s\n", wine_dbgstr_w(DllName));
+	if(DllHandle)
+		FreeLibrary(DllHandle);
+	return 0;
+}
+
+static DWORD DllUnregisterServer(LPCWSTR DllName)
+{
+	HRESULT hr;
+	DLLUNREGISTERSERVER pfDllUnregisterServer = NULL;
+	HMODULE DllHandle = NULL;
+
+	pfDllUnregisterServer = LoadProc(DllName, "DllUnregisterServer", &DllHandle);
+
+	hr = pfDllUnregisterServer();
+	if(FAILED(hr))
+	{
+		fprintf(stderr, "Failed to unregister dll %s\n", wine_dbgstr_w(DllName));
+		return 1;
+	}
+	printf("Successfully unregistered dll %s\n", wine_dbgstr_w(DllName));
+	if(DllHandle)
+		FreeLibrary(DllHandle);
+	return 0;
+}
+
+/*
+ * state machine to break up the command line properly
+ */
+
+enum chomp_state
+{
+	cs_whitespace,
+	cs_token,
+	cs_quote
+};
+
+static int chomp( WCHAR *str )
+{
+	enum chomp_state state = cs_whitespace;
+	WCHAR *p, *out;
+	int count = 0, ignore;
+
+	for( p = str, out = str; *p; p++ )
+	{
+		ignore = 1;
+		switch( state )
+		{
+		case cs_whitespace:
+			switch( *p )
+			{
+			case ' ':
+				break;
+			case '"':
+				state = cs_quote;
+				count++;
+				break;
+			default:
+				count++;
+				ignore = 0;
+				state = cs_token;
+			}
+			break;
+
+		case cs_token:
+			switch( *p )
+			{
+			case '"':
+				state = cs_quote;
+				break;
+			case ' ':
+				state = cs_whitespace;
+				*out++ = 0;
+				break;
+			default:
+				ignore = 0;
+			}
+			break;
+
+		case cs_quote:
+			switch( *p )
+			{
+			case '"':
+				state = cs_token;
+				break;
+			default:
+				ignore = 0;
+			}
+			break;
+		}
+		if( !ignore )
+			*out++ = *p;
+	}
+
+	*out = 0;
+
+	return count;
+}
+
+void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv )
+{
+	WCHAR **argv, *p = msi_strdup(cmdline);
+	int i, n;
+
+	n = chomp( p );
+	argv = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR*)*(n+1));
+	for( i=0; i<n; i++ )
+	{
+		argv[i] = p;
+		p += lstrlenW(p) + 1;
+	}
+	argv[i] = NULL;
+
+	*pargc = n;
+	*pargv = argv;
+}
+
+BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv )
+{
+	LONG r;
+	HKEY hkey = 0, hkeyArgs = 0;
+	DWORD sz = 0, type = 0;
+	LPWSTR buf = NULL;
+	BOOL ret = FALSE;
+
+	r = RegOpenKeyW(HKEY_LOCAL_MACHINE, InstallRunOnce, &hkey);
+	if(r != ERROR_SUCCESS)
+		return FALSE;
+	r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz);
+	if(r == ERROR_SUCCESS && type == REG_SZ)
+	{
+		buf = HeapAlloc(GetProcessHeap(), 0, sz);
+		r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)buf, &sz);
+		if( r == ERROR_SUCCESS )
+		{
+			process_args(buf, pargc, pargv);
+			ret = TRUE;
+		}
+	}
+	RegCloseKey(hkeyArgs);
+	return ret;
+}
+
+int main(int argc, char **argv)
+{
+	int i;
+	BOOL FunctionInstall = FALSE;
+	BOOL FunctionInstallAdmin = FALSE;
+	BOOL FunctionRepair = FALSE;
+	BOOL FunctionAdvertise = FALSE;
+	BOOL FunctionPatch = FALSE;
+	BOOL FunctionDllRegisterServer = FALSE;
+	BOOL FunctionDllUnregisterServer = FALSE;
+	BOOL FunctionRegServer = FALSE;
+	BOOL FunctionUnregServer = FALSE;
+	BOOL FunctionUnknown = FALSE;
+
+	LPWSTR PackageName = NULL;
+	LPWSTR Properties = NULL;
+	struct string_list *property_list = NULL;
+
+	DWORD RepairMode = 0;
+
+	DWORD AdvertiseMode = 0;
+	LPWSTR Transforms = NULL;
+	struct string_list *transform_list = NULL;
+	LANGID Language = 0;
+
+	DWORD LogMode = 0;
+	LPWSTR LogFileName = NULL;
+	DWORD LogAttributes = 0;
+
+	LPWSTR PatchFileName = NULL;
+	INSTALLTYPE InstallType = INSTALLTYPE_DEFAULT;
+
+	INSTALLUILEVEL InstallUILevel = INSTALLUILEVEL_FULL;
+
+	LPWSTR DllName = NULL;
+	DWORD ReturnCode;
+	LPWSTR *argvW = NULL;
+
+	/* overwrite the command line */
+	process_args( GetCommandLineW(), &argc, &argvW );
+
+	/*
+	 * If the args begin with /@ IDENT then we need to load the real
+	 * command line out of the RunOnceEntries key in the registry.
+	 *  We do that before starting to process the real commandline,
+	 * then overwrite the commandline again.
+	 */
+	if(!msi_strequal(argvW[1], "/@"))
+	{
+		if(!process_args_from_reg( argvW[2], &argc, &argvW ))
+			return 1;
+	}
+
+	for(i = 1; i < argc; i++)
+	{
+		WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
+
+		if (!msi_strequal(argvW[i], "/regserver"))
+		{
+			FunctionRegServer = TRUE;
+		}
+		else if (!msi_strequal(argvW[i], "/unregserver") || !msi_strequal(argvW[i], "/unregister"))
+		{
+			FunctionUnregServer = TRUE;
+		}
+		else if(!msi_strprefix(argvW[i], "/i"))
+		{
+			LPWSTR argvWi = argvW[i];
+			FunctionInstall = TRUE;
+			if(lstrlenW(argvWi) > 2)
+				argvWi += 2;
+			else
+			{
+				i++;
+				if(i >= argc)
+					ShowUsage(1);
+				WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
+				argvWi = argvW[i];
+			}
+			PackageName = argvWi;
+		}
+		else if(!msi_strequal(argvW[i], "/a"))
+		{
+			FunctionInstall = TRUE;
+			FunctionInstallAdmin = TRUE;
+			InstallType = INSTALLTYPE_NETWORK_IMAGE;
+			i++;
+			if(i >= argc)
+				ShowUsage(1);
+			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
+			PackageName = argvW[i];
+			StringListAppend(&property_list, ActionAdmin);
+		}
+		else if(!msi_strprefix(argvW[i], "/f"))
+		{
+			int j;
+			int len = lstrlenW(argvW[i]);
+			FunctionRepair = TRUE;
+			for(j = 2; j < len; j++)
+			{
+				switch(argvW[i][j])
+				{
+					case 'P':
+					case 'p':
+						RepairMode |= REINSTALLMODE_FILEMISSING;
+						break;
+					case 'O':
+					case 'o':
+						RepairMode |= REINSTALLMODE_FILEOLDERVERSION;
+						break;
+					case 'E':
+					case 'e':
+						RepairMode |= REINSTALLMODE_FILEEQUALVERSION;
+						break;
+					case 'D':
+					case 'd':
+						RepairMode |= REINSTALLMODE_FILEEXACT;
+						break;
+					case 'C':
+					case 'c':
+						RepairMode |= REINSTALLMODE_FILEVERIFY;
+						break;
+					case 'A':
+					case 'a':
+						RepairMode |= REINSTALLMODE_FILEREPLACE;
+						break;
+					case 'U':
+					case 'u':
+						RepairMode |= REINSTALLMODE_USERDATA;
+						break;
+					case 'M':
+					case 'm':
+						RepairMode |= REINSTALLMODE_MACHINEDATA;
+						break;
+					case 'S':
+					case 's':
+						RepairMode |= REINSTALLMODE_SHORTCUT;
+						break;
+					case 'V':
+					case 'v':
+						RepairMode |= REINSTALLMODE_PACKAGE;
+						break;
+					default:
+						fprintf(stderr, "Unknown option \"%c\" in Repair mode\n", argvW[i][j]);
+						break;
+				}
+			}
+			if(len == 2)
+			{
+				RepairMode = REINSTALLMODE_FILEMISSING |
+					REINSTALLMODE_FILEEQUALVERSION |
+					REINSTALLMODE_FILEVERIFY |
+					REINSTALLMODE_MACHINEDATA |
+					REINSTALLMODE_SHORTCUT;
+			}
+			i++;
+			if(i >= argc)
+				ShowUsage(1);
+			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
+			PackageName = argvW[i];
+		}
+		else if(!msi_strequal(argvW[i], "/x"))
+		{
+			FunctionInstall = TRUE;
+			i++;
+			if(i >= argc)
+				ShowUsage(1);
+			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
+			PackageName = argvW[i];
+			StringListAppend(&property_list, RemoveAll);
+		}
+		else if(!msi_strprefix(argvW[i], "/j"))
+		{
+			int j;
+			int len = lstrlenW(argvW[i]);
+			FunctionAdvertise = TRUE;
+			for(j = 2; j < len; j++)
+			{
+				switch(argvW[i][j])
+				{
+					case 'U':
+					case 'u':
+						AdvertiseMode = ADVERTISEFLAGS_USERASSIGN;
+						break;
+					case 'M':
+					case 'm':
+						AdvertiseMode = ADVERTISEFLAGS_MACHINEASSIGN;
+						break;
+					default:
+						fprintf(stderr, "Unknown option \"%c\" in Advertise mode\n", argvW[i][j]);
+						break;
+				}
+			}
+			i++;
+			if(i >= argc)
+				ShowUsage(1);
+			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
+			PackageName = argvW[i];
+		}
+		else if(!msi_strequal(argvW[i], "u"))
+		{
+			FunctionAdvertise = TRUE;
+			AdvertiseMode = ADVERTISEFLAGS_USERASSIGN;
+			i++;
+			if(i >= argc)
+				ShowUsage(1);
+			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
+			PackageName = argvW[i];
+		}
+		else if(!msi_strequal(argvW[i], "m"))
+		{
+			FunctionAdvertise = TRUE;
+			AdvertiseMode = ADVERTISEFLAGS_MACHINEASSIGN;
+			i++;
+			if(i >= argc)
+				ShowUsage(1);
+			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
+			PackageName = argvW[i];
+		}
+		else if(!msi_strequal(argvW[i], "/t"))
+		{
+			i++;
+			if(i >= argc)
+				ShowUsage(1);
+			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
+			StringListAppend(&transform_list, argvW[i]);
+		}
+		else if(!msi_strprefix(argvW[i], "TRANSFORMS="))
+		{
+			StringListAppend(&transform_list, argvW[i]+11);
+		}
+		else if(!msi_strequal(argvW[i], "/g"))
+		{
+			i++;
+			if(i >= argc)
+				ShowUsage(1);
+			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
+			Language = msi_atou(argvW[i]);
+		}
+		else if(!msi_strprefix(argvW[i], "/l"))
+		{
+			int j;
+			int len = lstrlenW(argvW[i]);
+			for(j = 2; j < len; j++)
+			{
+				switch(argvW[i][j])
+				{
+					case 'I':
+					case 'i':
+						LogMode |= INSTALLLOGMODE_INFO;
+						break;
+					case 'W':
+					case 'w':
+						LogMode |= INSTALLLOGMODE_WARNING;
+						break;
+					case 'E':
+					case 'e':
+						LogMode |= INSTALLLOGMODE_ERROR;
+						break;
+					case 'A':
+					case 'a':
+						LogMode |= INSTALLLOGMODE_ACTIONSTART;
+						break;
+					case 'R':
+					case 'r':
+						LogMode |= INSTALLLOGMODE_ACTIONDATA;
+						break;
+					case 'U':
+					case 'u':
+						LogMode |= INSTALLLOGMODE_USER;
+						break;
+					case 'C':
+					case 'c':
+						LogMode |= INSTALLLOGMODE_COMMONDATA;
+						break;
+					case 'M':
+					case 'm':
+						LogMode |= INSTALLLOGMODE_FATALEXIT;
+						break;
+					case 'O':
+					case 'o':
+						LogMode |= INSTALLLOGMODE_OUTOFDISKSPACE;
+						break;
+					case 'P':
+					case 'p':
+						LogMode |= INSTALLLOGMODE_PROPERTYDUMP;
+						break;
+					case 'V':
+					case 'v':
+						LogMode |= INSTALLLOGMODE_VERBOSE;
+						break;
+					case '*':
+						LogMode = INSTALLLOGMODE_FATALEXIT |
+							INSTALLLOGMODE_ERROR |
+							INSTALLLOGMODE_WARNING |
+							INSTALLLOGMODE_USER |
+							INSTALLLOGMODE_INFO |
+							INSTALLLOGMODE_RESOLVESOURCE |
+							INSTALLLOGMODE_OUTOFDISKSPACE |
+							INSTALLLOGMODE_ACTIONSTART |
+							INSTALLLOGMODE_ACTIONDATA |
+							INSTALLLOGMODE_COMMONDATA |
+							INSTALLLOGMODE_PROPERTYDUMP |
+							INSTALLLOGMODE_PROGRESS |
+							INSTALLLOGMODE_INITIALIZE |
+							INSTALLLOGMODE_TERMINATE |
+							INSTALLLOGMODE_SHOWDIALOG;
+						break;
+					case '+':
+						LogAttributes |= INSTALLLOGATTRIBUTES_APPEND;
+						break;
+					case '!':
+						LogAttributes |= INSTALLLOGATTRIBUTES_FLUSHEACHLINE;
+						break;
+					default:
+						break;
+				}
+			}
+			i++;
+			if(i >= argc)
+				ShowUsage(1);
+			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
+			LogFileName = argvW[i];
+			if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS)
+			{
+				fprintf(stderr, "Logging in %s (0x%08lx, %lu) failed\n",
+					 wine_dbgstr_w(LogFileName), LogMode, LogAttributes);
+				ExitProcess(1);
+			}
+		}
+		else if(!msi_strequal(argvW[i], "/p"))
+		{
+			FunctionPatch = TRUE;
+			i++;
+			if(i >= argc)
+				ShowUsage(1);
+			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
+			PatchFileName = argvW[i];
+		}
+		else if(!msi_strprefix(argvW[i], "/q"))
+		{
+			if(lstrlenW(argvW[i]) == 2 || !msi_strequal(argvW[i]+2, "n"))
+			{
+				InstallUILevel = INSTALLUILEVEL_NONE;
+			}
+			else if(!msi_strequal(argvW[i]+2, "b"))
+			{
+				InstallUILevel = INSTALLUILEVEL_BASIC;
+			}
+			else if(!msi_strequal(argvW[i]+2, "r"))
+			{
+				InstallUILevel = INSTALLUILEVEL_REDUCED;
+			}
+			else if(!msi_strequal(argvW[i]+2, "f"))
+			{
+				InstallUILevel = INSTALLUILEVEL_FULL|INSTALLUILEVEL_ENDDIALOG;
+			}
+			else if(!msi_strequal(argvW[i]+2, "n+"))
+			{
+				InstallUILevel = INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG;
+			}
+			else if(!msi_strequal(argvW[i]+2, "b+"))
+			{
+				InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG;
+			}
+			else if(!msi_strequal(argvW[i]+2, "b-"))
+			{
+				InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY;
+			}
+			else if(!msi_strequal(argvW[i]+2, "b+!"))
+			{
+				InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG;
+				WINE_FIXME("Unknown modifier: !\n");
+			}
+			else
+			{
+				fprintf(stderr, "Unknown option \"%s\" for UI level\n",
+					 wine_dbgstr_w(argvW[i]+2));
+			}
+		}
+		else if(!msi_strequal(argvW[i], "/y"))
+		{
+			FunctionDllRegisterServer = TRUE;
+			i++;
+			if(i >= argc)
+				ShowUsage(1);
+			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
+			DllName = argvW[i];
+		}
+		else if(!msi_strequal(argvW[i], "/z"))
+		{
+			FunctionDllUnregisterServer = TRUE;
+			i++;
+			if(i >= argc)
+				ShowUsage(1);
+			WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i]));
+			DllName = argvW[i];
+		}
+		else if(!msi_strequal(argvW[i], "/h") || !msi_strequal(argvW[i], "/?"))
+		{
+			ShowUsage(0);
+		}
+		else if(!msi_strequal(argvW[i], "/m"))
+		{
+			FunctionUnknown = TRUE;
+			WINE_FIXME("Unknown parameter /m\n");
+		}
+		else if(!msi_strequal(argvW[i], "/D"))
+		{
+			FunctionUnknown = TRUE;
+			WINE_FIXME("Unknown parameter /D\n");
+		}
+		else if(strchrW(argvW[i], '='))
+		{
+			StringListAppend(&property_list, argvW[i]);
+		}
+		else
+		{
+			FunctionInstall = TRUE;
+			PackageName = argvW[i];
+		}
+	}
+
+	/* start the GUI */
+	MsiSetInternalUI(InstallUILevel, NULL);
+
+	Properties = build_properties( property_list );
+	Transforms = build_transforms( transform_list );
+
+	if(FunctionInstallAdmin && FunctionPatch)
+		FunctionInstall = FALSE;
+
+	ReturnCode = 1;
+	if(FunctionInstall)
+	{
+		if(IsProductCode(PackageName))
+			ReturnCode = MsiConfigureProductExW(PackageName, 0, INSTALLSTATE_DEFAULT, Properties);
+		else
+			ReturnCode = MsiInstallProductW(PackageName, Properties);
+	}
+	else if(FunctionRepair)
+	{
+		if(IsProductCode(PackageName))
+			WINE_FIXME("Product code treatment not implemented yet\n");
+		else
+			ReturnCode = MsiReinstallProductW(PackageName, RepairMode);
+	}
+	else if(FunctionAdvertise)
+	{
+		ReturnCode = MsiAdvertiseProductW(PackageName, (LPWSTR) AdvertiseMode, Transforms, Language);
+	}
+	else if(FunctionPatch)
+	{
+		ReturnCode = MsiApplyPatchW(PatchFileName, PackageName, InstallType, Properties);
+	}
+	else if(FunctionDllRegisterServer)
+	{
+		ReturnCode = DllRegisterServer(DllName);
+	}
+	else if(FunctionDllUnregisterServer)
+	{
+		ReturnCode = DllUnregisterServer(DllName);
+	}
+	else if (FunctionRegServer)
+	{
+		WINE_FIXME( "/regserver not implemented yet, ignoring\n" );
+	}
+	else if (FunctionUnregServer)
+	{
+		WINE_FIXME( "/unregserver not implemented yet, ignoring\n" );
+	}
+	else if (FunctionUnknown)
+	{
+		WINE_FIXME( "Unknown function, ignoring\n" );
+	}
+	else
+		ShowUsage(1);
+
+	return ReturnCode;
+}
diff --git a/reactos/subsys/system/msiexec/msiexec.h b/reactos/subsys/system/msiexec/msiexec.h
new file mode 100644
index 00000000000..5f9b89943b0
--- /dev/null
+++ b/reactos/subsys/system/msiexec/msiexec.h
@@ -0,0 +1,22 @@
+/*
+ * Msiexec (msiexec.h)
+ *
+ * Copyright 2004 Vincent Béron
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+typedef HRESULT (*DLLREGISTERSERVER)(void);
+typedef HRESULT (*DLLUNREGISTERSERVER)(void);
diff --git a/reactos/subsys/system/msiexec/version.rc b/reactos/subsys/system/msiexec/version.rc
new file mode 100644
index 00000000000..64be1378e10
--- /dev/null
+++ b/reactos/subsys/system/msiexec/version.rc
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2004 Mike McCormack
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#define WINE_FILEDESCRIPTION_STR "Wine Installer"
+#define WINE_FILENAME_STR "msiexec.exe"
+#define WINE_FILEVERSION 2,0,2600,1183
+#define WINE_FILEVERSION_STR "2.0.2600.1183"
+#define WINE_PRODUCTVERSION 2,0,2600,1183
+#define WINE_PRODUCTVERSION_STR "2.0.2600.1183"
+#define WINE_PRODUCTNAME_STR "Wine Installer"
+
+#include "wine/wine_common_ver.rc"