diff --git a/dlls/itss/Makefile.in b/dlls/itss/Makefile.in
index 76e9cac4ef0..1485dfd9a24 100644
--- a/dlls/itss/Makefile.in
+++ b/dlls/itss/Makefile.in
@@ -12,9 +12,12 @@ C_SRCS = \
 	lzx.c \
 	itss.c \
 	moniker.c \
-	regsvr.c \
 	storage.c
 
+RC_SRCS = rsrc.rc
+
 @MAKE_DLL_RULES@
 
+rsrc.res: itss.inf
+
 @DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c
index 33b1608d8c0..742465d37fe 100644
--- a/dlls/itss/itss.c
+++ b/dlls/itss/itss.c
@@ -34,6 +34,7 @@
 #include "winnls.h"
 #include "winreg.h"
 #include "ole2.h"
+#include "advpub.h"
 
 #include "uuids.h"
 
@@ -50,12 +51,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(itss);
 static HRESULT ITSS_create(IUnknown *pUnkOuter, LPVOID *ppObj);
 
 LONG dll_count = 0;
+static HINSTANCE hInst;
 
 BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 {
     switch(fdwReason) {
     case DLL_PROCESS_ATTACH:
         DisableThreadLibraryCalls(hInstDLL);
+        hInst = hInstDLL;
         break;
     case DLL_PROCESS_DETACH:
         break;
@@ -373,3 +376,72 @@ HRESULT WINAPI DllCanUnloadNow(void)
     TRACE("dll_count = %u\n", dll_count);
     return dll_count ? S_FALSE : S_OK;
 }
+
+#define INF_SET_ID(id)            \
+    do                            \
+    {                             \
+        static CHAR name[] = #id; \
+                                  \
+        pse[i].pszName = name;    \
+        clsids[i++] = &id;        \
+    } while (0)
+
+#define INF_SET_CLSID(clsid) INF_SET_ID(CLSID_ ## clsid)
+
+static HRESULT register_server(BOOL do_register)
+{
+    HRESULT hres;
+    HMODULE hAdvpack;
+    typeof(RegInstallA) *pRegInstall;
+    STRTABLEA strtable;
+    STRENTRYA pse[4];
+    static CLSID const *clsids[4];
+    int i = 0;
+
+    static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0};
+
+    INF_SET_CLSID(ITStorage);
+    INF_SET_CLSID(MSFSStore);
+    INF_SET_CLSID(MSITStore);
+    INF_SET_CLSID(ITSProtocol);
+
+    strtable.cEntries = sizeof(pse)/sizeof(pse[0]);
+    strtable.pse = pse;
+
+    for(i=0; i < strtable.cEntries; i++) {
+        pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39);
+        sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
+                clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0],
+                clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4],
+                clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]);
+    }
+
+    hAdvpack = LoadLibraryW(wszAdvpack);
+    pRegInstall = (typeof(RegInstallA)*)GetProcAddress(hAdvpack, "RegInstall");
+
+    hres = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable);
+
+    for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++)
+        HeapFree(GetProcessHeap(), 0, pse[i].pszValue);
+
+    return hres;
+}
+
+#undef INF_SET_CLSID
+#undef INF_SET_ID
+
+/***********************************************************************
+ *          DllRegisterServer (ITSS.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+    return register_server(TRUE);
+}
+
+/***********************************************************************
+ *          DllUnregisterServer (ITSS.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+    return register_server(FALSE);
+}
diff --git a/dlls/itss/itss.inf b/dlls/itss/itss.inf
new file mode 100644
index 00000000000..eeefbbb93bc
--- /dev/null
+++ b/dlls/itss/itss.inf
@@ -0,0 +1,79 @@
+[version]
+Signature="$CHICAGO$"
+
+
+[RegisterDll]
+AddReg=Classes.Reg, Misc.Reg
+
+
+[UnregisterDll]
+DelReg=Classes.Reg, Misc.Reg
+
+
+[Classes.Reg]
+
+;; ITStorage
+HKCR,"CLSID\%CLSID_ITStorage%",,,"Microsoft InfoTech IStorage System"
+HKCR,"CLSID\%CLSID_ITStorage%\InProcServer32",,,"itss.dll"
+HKCR,"CLSID\%CLSID_ITStorage%\InProcServer32","ThreadingModel",,"Both"
+HKCR,"CLSID\%CLSID_ITStorage%\NotInsertable",,,""
+HKCR,"CLSID\%CLSID_ITStorage%\ProgID",,,"MSITFS1.0"
+HKCR,"CLSID\%CLSID_ITStorage%\VersionIndependentProgID",,,"MSITFS"
+
+HKCR,"MSITFS",,,"Microsoft InfoTech IStorage System"
+HKCR,"MSITFS\CLSID",,,"%CLSID_ITStorage%"
+HKCR,"MSITFS\CurVer",,,"MSITFS1.0"
+
+;; ITSProtocol for IE 3.0
+HKCR,"CLSID\%CLSID_MSITStore%",,,"Microsoft InfoTech Protocol for IE 3.0"
+HKCR,"CLSID\%CLSID_MSITStore%\InProcServer32",,,"itss.dll"
+HKCR,"CLSID\%CLSID_MSITStore%\InProcServer32","ThreadingModel",,"Both"
+HKCR,"CLSID\%CLSID_MSITStore%\NotInsertable",,,""
+HKCR,"CLSID\%CLSID_MSITStore%\ProgID",,,"MSITFS1.0"
+HKCR,"CLSID\%CLSID_MSITStore%\VersionIndependentProgID",,,"MSITFS"
+
+HKCR,"MSITStore",,,"Microsoft InfoTech Protocol for IE 3.0"
+HKCR,"MSITStore\CLSID",,,"%CLSID_MSITStore%"
+HKCR,"MSITStore\CurVer",,,"MSITStore1.0"
+
+
+;; ITSProtocol for IE 4.0
+HKCR,"CLSID\%CLSID_ITSProtocol%",,,"Microsoft InfoTech Protocol for IE 4.0"
+HKCR,"CLSID\%CLSID_ITSProtocol%\InProcServer32",,,"itss.dll"
+HKCR,"CLSID\%CLSID_ITSProtocol%\InProcServer32","ThreadingModel",,"Both"
+HKCR,"CLSID\%CLSID_ITSProtocol%\NotInsertable",,,""
+HKCR,"CLSID\%CLSID_ITSProtocol%\ProgID",,,"MSITFS1.0"
+HKCR,"CLSID\%CLSID_ITSProtocol%%\VersionIndependentProgID",,,"MSITFS"
+
+HKCR,"ITSProtocol","Microsoft InfoTech Protocols for IE 4.0"
+HKCR,"ITSProtocol\CLSID",,,"%CLSID_ITSProtocol%"
+HKCR,"ITSProtocol\CurVer",,,"ITSProtocol1.0"
+
+
+;; MSFSStore
+HKCR,"CLSID\%CLSID_MSFSStore%",,,"Microsoft InfoTech IStorage for Win32 Files"
+HKCR,"CLSID\%CLSID_MSFSStore%\InProcServer32",,,"itss.dll"
+HKCR,"CLSID\%CLSID_MSFSStore%\InProcServer32","ThreadingModel",,"Both"
+HKCR,"CLSID\%CLSID_MSFSStore%\NotInsertable",,,""
+HKCR,"CLSID\%CLSID_MSFSStore%\ProgID",,,"MSITFS1.0"
+HKCR,"CLSID\%CLSID_MSFSStore%\VersionIndependentProgID",,,"MSITFS"
+
+HKCR,"MSFSStore",,,"Microsoft InfoTech IStorage for Win32 Files"
+HKCR,"MSFSStore\CLSID",,,"%CLSID_MSFSStore%"
+HKCR,"MSFSStore\CurVer",,,"MSFSStore1.0"
+
+
+[Misc.Reg]
+
+HKCR,".its",,,"ITS File"
+HKCR,"ITS FILE",,,"Internet Document Set"
+HKCR,"ITS FILE\DefaultIcon",,,"itss.dll,0"
+;; HKCR "ITS FILE\shell\open\command",,,"FIXME"
+
+HKCR,"PROTOCOLS\Handler\its",,,"its: Asychronous Pluggable Protocol Handler"
+HKCR,"PROTOCOLS\Handler\its","CLSID",,"%CLSID_ITSProtocol%"
+HKCR,"PROTOCOLS\Handler\ms-its",,,"ms-its: Asychronous Pluggable Protocol Handler"
+HKCR,"PROTOCOLS\Handler\ms-its","CLSID",,"%CLSID_ITSProtocol%"
+
+HKCR,"PROTOCOLS\Name-Space Handler\mk",,,"NameSpace Filter for MK:@MSITStore:..."
+HKCR,"PROTOCOLS\Name-Space Handler\mk\*","CLSID",,"%CLSID_ITSProtocol%"
diff --git a/dlls/itss/regsvr.c b/dlls/itss/regsvr.c
deleted file mode 100644
index bac6ac17b48..00000000000
--- a/dlls/itss/regsvr.c
+++ /dev/null
@@ -1,563 +0,0 @@
-/*
- *	self-registerable dll functions for itss.dll
- *
- * Copyright (C) 2003 John K. Hohm
- *
- * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <stdarg.h>
-#include <string.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winreg.h"
-#include "winerror.h"
-#include "ole2.h"
-
-#include "wine/itss.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(itss);
-
-/*
- * Near the bottom of this file are the exported DllRegisterServer and
- * DllUnregisterServer, which make all this worthwhile.
- */
-
-/***********************************************************************
- *		interface for self-registering
- */
-struct regsvr_interface
-{
-    IID const *iid;		/* NULL for end of list */
-    LPCSTR name;		/* can be NULL to omit */
-    IID const *base_iid;	/* can be NULL to omit */
-    int num_methods;		/* can be <0 to omit */
-    CLSID const *ps_clsid;	/* can be NULL to omit */
-    CLSID const *ps_clsid32;	/* can be NULL to omit */
-};
-
-static HRESULT register_interfaces(struct regsvr_interface const *list);
-static HRESULT unregister_interfaces(struct regsvr_interface const *list);
-
-struct regsvr_coclass
-{
-    CLSID const *clsid;		/* NULL for end of list */
-    LPCSTR name;		/* can be NULL to omit */
-    LPCSTR ips;			/* can be NULL to omit */
-    LPCSTR ips32;		/* can be NULL to omit */
-    LPCSTR ips32_tmodel;	/* can be NULL to omit */
-    LPCSTR progid;		/* can be NULL to omit */
-    LPCSTR viprogid;		/* can be NULL to omit */
-    LPCSTR progid_extra;	/* can be NULL to omit */
-};
-
-static HRESULT register_coclasses(struct regsvr_coclass const *list);
-static HRESULT unregister_coclasses(struct regsvr_coclass const *list);
-
-/***********************************************************************
- *		static string constants
- */
-static WCHAR const interface_keyname[10] = {
-    'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 };
-static WCHAR const base_ifa_keyname[14] = {
-    'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c',
-    'e', 0 };
-static WCHAR const num_methods_keyname[11] = {
-    'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 };
-static WCHAR const ps_clsid_keyname[15] = {
-    'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's',
-    'i', 'd', 0 };
-static WCHAR const ps_clsid32_keyname[17] = {
-    'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's',
-    'i', 'd', '3', '2', 0 };
-static WCHAR const clsid_keyname[6] = {
-    'C', 'L', 'S', 'I', 'D', 0 };
-static WCHAR const curver_keyname[7] = {
-    'C', 'u', 'r', 'V', 'e', 'r', 0 };
-static WCHAR const ips_keyname[13] = {
-    'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
-    0 };
-static WCHAR const ips32_keyname[15] = {
-    'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
-    '3', '2', 0 };
-static WCHAR const progid_keyname[7] = {
-    'P', 'r', 'o', 'g', 'I', 'D', 0 };
-static WCHAR const viprogid_keyname[25] = {
-    'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p',
-    'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D',
-    0 };
-static char const tmodel_valuename[] = "ThreadingModel";
-static WCHAR const lcs32_keyname[] = {
-    'L','o','c','a','l','S','e','r','v','e','r','3','2',0 };
-static const WCHAR szIERelPath[] = {
-    'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','\\',
-    'i','e','x','p','l','o','r','e','.','e','x','e',0 };
-
-/***********************************************************************
- *		static helper functions
- */
-static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid);
-static LONG register_key_defvalueW(HKEY base, WCHAR const *name,
-				   WCHAR const *value);
-static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
-				   char const *value);
-static LONG register_progid(WCHAR const *clsid,
-			    char const *progid, char const *curver_progid,
-			    char const *name, char const *extra);
-static LONG recursive_delete_key(HKEY key);
-static LONG recursive_delete_keyA(HKEY base, char const *name);
-static LONG recursive_delete_keyW(HKEY base, WCHAR const *name);
-
-/***********************************************************************
- *		register_interfaces
- */
-static HRESULT register_interfaces(struct regsvr_interface const *list)
-{
-    LONG res = ERROR_SUCCESS;
-    HKEY interface_key;
-
-    res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0,
-			  KEY_READ | KEY_WRITE, NULL, &interface_key, NULL);
-    if (res != ERROR_SUCCESS) goto error_return;
-
-    for (; res == ERROR_SUCCESS && list->iid; ++list) {
-	WCHAR buf[39];
-	HKEY iid_key;
-
-	StringFromGUID2(list->iid, buf, 39);
-	res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0,
-			      KEY_READ | KEY_WRITE, NULL, &iid_key, NULL);
-	if (res != ERROR_SUCCESS) goto error_close_interface_key;
-
-	if (list->name) {
-	    res = RegSetValueExA(iid_key, NULL, 0, REG_SZ,
-				 (CONST BYTE*)(list->name),
-				 strlen(list->name) + 1);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-	if (list->base_iid) {
-	    res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-	if (0 <= list->num_methods) {
-	    static WCHAR const fmt[3] = { '%', 'd', 0 };
-	    HKEY key;
-
-	    res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0,
-				  KEY_READ | KEY_WRITE, NULL, &key, NULL);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-
-	    wsprintfW(buf, fmt, list->num_methods);
-	    res = RegSetValueExW(key, NULL, 0, REG_SZ,
-				 (CONST BYTE*)buf,
-				 (lstrlenW(buf) + 1) * sizeof(WCHAR));
-	    RegCloseKey(key);
-
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-	if (list->ps_clsid) {
-	    res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-	if (list->ps_clsid32) {
-	    res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32);
-	    if (res != ERROR_SUCCESS) goto error_close_iid_key;
-	}
-
-    error_close_iid_key:
-	RegCloseKey(iid_key);
-    }
-
-error_close_interface_key:
-    RegCloseKey(interface_key);
-error_return:
-    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/***********************************************************************
- *		unregister_interfaces
- */
-static HRESULT unregister_interfaces(struct regsvr_interface const *list)
-{
-    LONG res = ERROR_SUCCESS;
-    HKEY interface_key;
-
-    res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0,
-			KEY_READ | KEY_WRITE, &interface_key);
-    if (res == ERROR_FILE_NOT_FOUND) return S_OK;
-    if (res != ERROR_SUCCESS) goto error_return;
-
-    for (; res == ERROR_SUCCESS && list->iid; ++list) {
-	WCHAR buf[39];
-
-	StringFromGUID2(list->iid, buf, 39);
-	res = recursive_delete_keyW(interface_key, buf);
-    }
-
-    RegCloseKey(interface_key);
-error_return:
-    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/***********************************************************************
- *		register_coclasses
- */
-static HRESULT register_coclasses(struct regsvr_coclass const *list)
-{
-    LONG res = ERROR_SUCCESS;
-    HKEY coclass_key;
-
-    res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0,
-			  KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL);
-    if (res != ERROR_SUCCESS) goto error_return;
-
-    for (; res == ERROR_SUCCESS && list->clsid; ++list) {
-	WCHAR buf[39];
-	HKEY clsid_key;
-
-	StringFromGUID2(list->clsid, buf, 39);
-	res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0,
-			      KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL);
-	if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-
-	if (list->name) {
-	    res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ,
-				 (CONST BYTE*)(list->name),
-				 strlen(list->name) + 1);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-	if (list->ips) {
-	    res = register_key_defvalueA(clsid_key, ips_keyname, list->ips);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-	if (list->ips32) {
-	    HKEY ips32_key;
-
-	    res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0,
-				  KEY_READ | KEY_WRITE, NULL,
-				  &ips32_key, NULL);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-
-	    res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ,
-				 (CONST BYTE*)list->ips32,
-				 lstrlenA(list->ips32) + 1);
-	    if (res == ERROR_SUCCESS && list->ips32_tmodel)
-		res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ,
-				     (CONST BYTE*)list->ips32_tmodel,
-				     strlen(list->ips32_tmodel) + 1);
-	    RegCloseKey(ips32_key);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-	if (list->progid) {
-	    res = register_key_defvalueA(clsid_key, progid_keyname,
-					 list->progid);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-
-	    res = register_progid(buf, list->progid, NULL,
-				  list->name, list->progid_extra);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-	if (list->viprogid) {
-	    res = register_key_defvalueA(clsid_key, viprogid_keyname,
-					 list->viprogid);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-
-	    res = register_progid(buf, list->viprogid, list->progid,
-				  list->name, list->progid_extra);
-	    if (res != ERROR_SUCCESS) goto error_close_clsid_key;
-	}
-
-    error_close_clsid_key:
-	RegCloseKey(clsid_key);
-    }
-
-error_close_coclass_key:
-    RegCloseKey(coclass_key);
-error_return:
-    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/***********************************************************************
- *		unregister_coclasses
- */
-static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
-{
-    LONG res = ERROR_SUCCESS;
-    HKEY coclass_key;
-
-    res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0,
-			KEY_READ | KEY_WRITE, &coclass_key);
-    if (res == ERROR_FILE_NOT_FOUND) return S_OK;
-    if (res != ERROR_SUCCESS) goto error_return;
-
-    for (; res == ERROR_SUCCESS && list->clsid; ++list) {
-	WCHAR buf[39];
-
-	StringFromGUID2(list->clsid, buf, 39);
-	res = recursive_delete_keyW(coclass_key, buf);
-	if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-
-	if (list->progid) {
-	    res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid);
-	    if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-	}
-
-	if (list->viprogid) {
-	    res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid);
-	    if (res != ERROR_SUCCESS) goto error_close_coclass_key;
-	}
-    }
-
-error_close_coclass_key:
-    RegCloseKey(coclass_key);
-error_return:
-    return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
-}
-
-/***********************************************************************
- *		regsvr_key_guid
- */
-static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid)
-{
-    WCHAR buf[39];
-
-    StringFromGUID2(guid, buf, 39);
-    return register_key_defvalueW(base, name, buf);
-}
-
-/***********************************************************************
- *		regsvr_key_defvalueW
- */
-static LONG register_key_defvalueW(
-    HKEY base,
-    WCHAR const *name,
-    WCHAR const *value)
-{
-    LONG res;
-    HKEY key;
-
-    res = RegCreateKeyExW(base, name, 0, NULL, 0,
-			  KEY_READ | KEY_WRITE, NULL, &key, NULL);
-    if (res != ERROR_SUCCESS) return res;
-    res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
-			 (lstrlenW(value) + 1) * sizeof(WCHAR));
-    RegCloseKey(key);
-    return res;
-}
-
-/***********************************************************************
- *		regsvr_key_defvalueA
- */
-static LONG register_key_defvalueA(
-    HKEY base,
-    WCHAR const *name,
-    char const *value)
-{
-    LONG res;
-    HKEY key;
-
-    res = RegCreateKeyExW(base, name, 0, NULL, 0,
-			  KEY_READ | KEY_WRITE, NULL, &key, NULL);
-    if (res != ERROR_SUCCESS) return res;
-    res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
-			 lstrlenA(value) + 1);
-    RegCloseKey(key);
-    return res;
-}
-
-/***********************************************************************
- *		regsvr_progid
- */
-static LONG register_progid(
-    WCHAR const *clsid,
-    char const *progid,
-    char const *curver_progid,
-    char const *name,
-    char const *extra)
-{
-    LONG res;
-    HKEY progid_key;
-
-    res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0,
-			  NULL, 0, KEY_READ | KEY_WRITE, NULL,
-			  &progid_key, NULL);
-    if (res != ERROR_SUCCESS) return res;
-
-    if (name) {
-	res = RegSetValueExA(progid_key, NULL, 0, REG_SZ,
-			     (CONST BYTE*)name, strlen(name) + 1);
-	if (res != ERROR_SUCCESS) goto error_close_progid_key;
-    }
-
-    if (clsid) {
-	res = register_key_defvalueW(progid_key, clsid_keyname, clsid);
-	if (res != ERROR_SUCCESS) goto error_close_progid_key;
-    }
-
-    if (curver_progid) {
-	res = register_key_defvalueA(progid_key, curver_keyname,
-				     curver_progid);
-	if (res != ERROR_SUCCESS) goto error_close_progid_key;
-    }
-
-    if (extra) {
-	HKEY extra_key;
-
-	res = RegCreateKeyExA(progid_key, extra, 0,
-			      NULL, 0, KEY_READ | KEY_WRITE, NULL,
-			      &extra_key, NULL);
-	if (res == ERROR_SUCCESS)
-	    RegCloseKey(extra_key);
-    }
-
-error_close_progid_key:
-    RegCloseKey(progid_key);
-    return res;
-}
-
-/***********************************************************************
- *		recursive_delete_key
- */
-static LONG recursive_delete_key(HKEY key)
-{
-    LONG res;
-    WCHAR subkey_name[MAX_PATH];
-    DWORD cName;
-    HKEY subkey;
-
-    for (;;) {
-	cName = sizeof(subkey_name) / sizeof(WCHAR);
-	res = RegEnumKeyExW(key, 0, subkey_name, &cName,
-			    NULL, NULL, NULL, NULL);
-	if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) {
-	    res = ERROR_SUCCESS; /* presumably we're done enumerating */
-	    break;
-	}
-	res = RegOpenKeyExW(key, subkey_name, 0,
-			    KEY_READ | KEY_WRITE, &subkey);
-	if (res == ERROR_FILE_NOT_FOUND) continue;
-	if (res != ERROR_SUCCESS) break;
-
-	res = recursive_delete_key(subkey);
-	RegCloseKey(subkey);
-	if (res != ERROR_SUCCESS) break;
-    }
-
-    if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0);
-    return res;
-}
-
-/***********************************************************************
- *		recursive_delete_keyA
- */
-static LONG recursive_delete_keyA(HKEY base, char const *name)
-{
-    LONG res;
-    HKEY key;
-
-    res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key);
-    if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS;
-    if (res != ERROR_SUCCESS) return res;
-    res = recursive_delete_key(key);
-    RegCloseKey(key);
-    return res;
-}
-
-/***********************************************************************
- *		recursive_delete_keyW
- */
-static LONG recursive_delete_keyW(HKEY base, WCHAR const *name)
-{
-    LONG res;
-    HKEY key;
-
-    res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key);
-    if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS;
-    if (res != ERROR_SUCCESS) return res;
-    res = recursive_delete_key(key);
-    RegCloseKey(key);
-    return res;
-}
-
-/***********************************************************************
- *		coclass list
- */
-
-static struct regsvr_coclass const coclass_list[] = {
-    {   &CLSID_ITStorage,
-        "CLSID_ITStorage",
-        NULL,
-        "itss.dll",
-        "Both"
-    },
-    {   &CLSID_MSITStore,
-        "Microsoft InforTech Protocol for IE 3.0",
-        NULL,
-        "itss.dll",
-        "Both",
-        "MSITFS1.0",
-        "MSITFS"
-    },
-    { NULL }			/* list terminator */
-};
-
-/***********************************************************************
- *		interface list
- */
-
-static struct regsvr_interface const interface_list[] = {
-    { NULL }			/* list terminator */
-};
-
-/***********************************************************************
- *		DllRegisterServer (ITSS.@)
- */
-HRESULT WINAPI DllRegisterServer(void)
-{
-    HRESULT hr;
-
-    TRACE("\n");
-
-    hr = register_coclasses(coclass_list);
-    if (SUCCEEDED(hr))
-	hr = register_interfaces(interface_list);
-    return hr;
-}
-
-/***********************************************************************
- *		DllUnregisterServer (ITSS.@)
- */
-HRESULT WINAPI DllUnregisterServer(void)
-{
-    HRESULT hr;
-
-    TRACE("\n");
-
-    hr = unregister_coclasses(coclass_list);
-    if (SUCCEEDED(hr))
-	hr = unregister_interfaces(interface_list);
-    return hr;
-}
diff --git a/dlls/itss/rsrc.rc b/dlls/itss/rsrc.rc
new file mode 100644
index 00000000000..b9f961de5b1
--- /dev/null
+++ b/dlls/itss/rsrc.rc
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2006 Jacek Caban for CodeWeavers
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+REGINST REGINST itss.inf
diff --git a/include/wine/itss.idl b/include/wine/itss.idl
index b613b6b6662..9d09cb65f1a 100644
--- a/include/wine/itss.idl
+++ b/include/wine/itss.idl
@@ -90,4 +90,6 @@ interface IITStorage : IUnknown
 }
 
 cpp_quote("DEFINE_GUID(CLSID_ITStorage,0x5d02926a,0x212e,0x11d0,0x9d,0xf9,0x00,0xa0,0xc9,0x22,0xe6,0xec);")
+cpp_quote("DEFINE_GUID(CLSID_MSFSStore,0xd54eee56,0xaaab,0x11d0,0x9e,0x1d,0x00,0xa0,0xc9,0x22,0xe6,0xec);")
 cpp_quote("DEFINE_GUID(CLSID_MSITStore,0x9d148290,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);")
+cpp_quote("DEFINE_GUID(CLSID_ITSProtocol,0x9d148291,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);")