diff --git a/Makefile.in b/Makefile.in
index 541ff0dfd405c8a0c0d314fcf9b9f3ea2dc3fc95..565871c72c9143dd976f1be86e6851ff9634cda4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -369,6 +369,7 @@ ALL_MAKEFILES = \
 	dlls/sti/Makefile \
 	dlls/strmiids/Makefile \
 	dlls/svrapi/Makefile \
+	dlls/sxs/Makefile \
 	dlls/tapi32/Makefile \
 	dlls/twain_32/Makefile \
 	dlls/unicows/Makefile \
@@ -711,6 +712,7 @@ dlls/stdole32.tlb/Makefile: dlls/stdole32.tlb/Makefile.in dlls/Makedll.rules
 dlls/sti/Makefile: dlls/sti/Makefile.in dlls/Makedll.rules
 dlls/strmiids/Makefile: dlls/strmiids/Makefile.in dlls/Makeimplib.rules
 dlls/svrapi/Makefile: dlls/svrapi/Makefile.in dlls/Makedll.rules
+dlls/sxs/Makefile: dlls/sxs/Makefile.in dlls/Makedll.rules
 dlls/tapi32/Makefile: dlls/tapi32/Makefile.in dlls/Makedll.rules
 dlls/twain_32/Makefile: dlls/twain_32/Makefile.in dlls/Makedll.rules
 dlls/unicows/Makefile: dlls/unicows/Makefile.in dlls/Makedll.rules
diff --git a/configure b/configure
index e086a935ce9518a98cfe7f235943c1de841490b1..e0790fca77007f3994bc221bec138a550b19b8b5 100755
--- a/configure
+++ b/configure
@@ -20627,6 +20627,8 @@ ac_config_files="$ac_config_files dlls/strmiids/Makefile"
 
 ac_config_files="$ac_config_files dlls/svrapi/Makefile"
 
+ac_config_files="$ac_config_files dlls/sxs/Makefile"
+
 ac_config_files="$ac_config_files dlls/tapi32/Makefile"
 
 ac_config_files="$ac_config_files dlls/twain_32/Makefile"
@@ -21636,6 +21638,7 @@ do
     "dlls/sti/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sti/Makefile" ;;
     "dlls/strmiids/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/strmiids/Makefile" ;;
     "dlls/svrapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/svrapi/Makefile" ;;
+    "dlls/sxs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sxs/Makefile" ;;
     "dlls/tapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/tapi32/Makefile" ;;
     "dlls/twain_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/Makefile" ;;
     "dlls/unicows/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/unicows/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 5f718c723d8ca12847999934a77a7f052f6194ff..6fd21b45a3d21e8b400a3add3a14ca1c41d316a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1704,6 +1704,7 @@ AC_CONFIG_FILES([dlls/stdole32.tlb/Makefile])
 AC_CONFIG_FILES([dlls/sti/Makefile])
 AC_CONFIG_FILES([dlls/strmiids/Makefile])
 AC_CONFIG_FILES([dlls/svrapi/Makefile])
+AC_CONFIG_FILES([dlls/sxs/Makefile])
 AC_CONFIG_FILES([dlls/tapi32/Makefile])
 AC_CONFIG_FILES([dlls/twain_32/Makefile])
 AC_CONFIG_FILES([dlls/unicows/Makefile])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 7ec57113ff906b50c431b1e1cca7051e901e84e2..65947624a8bf328de3f336d76099012b6f10cd0a 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -171,6 +171,7 @@ BASEDIRS = \
 	stdole32.tlb \
 	sti \
 	svrapi \
+	sxs \
 	tapi32 \
 	twain_32 \
 	unicows \
diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..da028e4071b721b731411664a026ab74b3a0e987
--- /dev/null
+++ b/dlls/sxs/Makefile.in
@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = sxs.dll
+IMPORTS   = kernel32
+
+C_SRCS = \
+	sxs.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c
new file mode 100644
index 0000000000000000000000000000000000000000..cd64de562f64b909e9af4adab4a8822bef90b2d6
--- /dev/null
+++ b/dlls/sxs/sxs.c
@@ -0,0 +1,45 @@
+/*
+ * sxs main
+ *
+ * Copyright 2007 EA Durbin
+ *
+ * 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 "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(sxs);
+
+
+/***********************************************************************
+ *             DllMain   (SXS.@)
+ *
+ */
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+    switch(fdwReason)
+    {
+    case DLL_WINE_PREATTACH:
+        return FALSE;  /* prefer native version */
+    case DLL_PROCESS_ATTACH:
+        DisableThreadLibraryCalls( hinstDLL );
+        break;
+    }
+    return TRUE;
+}
diff --git a/dlls/sxs/sxs.spec b/dlls/sxs/sxs.spec
new file mode 100644
index 0000000000000000000000000000000000000000..012d06b9c3868c4670219f4724ec0e513c5d1587
--- /dev/null
+++ b/dlls/sxs/sxs.spec
@@ -0,0 +1,2 @@
+@ stub CreateAssemblyCache
+@ stub CreateAssemblyNameObject