diff --git a/Makefile.in b/Makefile.in
index 0e91431a4a2..71a3eda09b5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -409,6 +409,7 @@ ALL_MAKEFILES = \
 	dlls/slbcsp/Makefile \
 	dlls/snmpapi/Makefile \
 	dlls/snmpapi/tests/Makefile \
+	dlls/softpub/Makefile \
 	dlls/spoolss/Makefile \
 	dlls/spoolss/tests/Makefile \
 	dlls/stdole2.tlb/Makefile \
@@ -806,6 +807,7 @@ dlls/shlwapi/tests/Makefile: dlls/shlwapi/tests/Makefile.in dlls/Maketest.rules
 dlls/slbcsp/Makefile: dlls/slbcsp/Makefile.in dlls/Makedll.rules
 dlls/snmpapi/Makefile: dlls/snmpapi/Makefile.in dlls/Makedll.rules
 dlls/snmpapi/tests/Makefile: dlls/snmpapi/tests/Makefile.in dlls/Maketest.rules
+dlls/softpub/Makefile: dlls/softpub/Makefile.in dlls/Makedll.rules
 dlls/spoolss/Makefile: dlls/spoolss/Makefile.in dlls/Makedll.rules
 dlls/spoolss/tests/Makefile: dlls/spoolss/tests/Makefile.in dlls/Maketest.rules
 dlls/stdole2.tlb/Makefile: dlls/stdole2.tlb/Makefile.in dlls/Makedll.rules
diff --git a/configure b/configure
index 4787bb92708..4387bb55635 100755
--- a/configure
+++ b/configure
@@ -21669,6 +21669,8 @@ ac_config_files="$ac_config_files dlls/snmpapi/Makefile"
 
 ac_config_files="$ac_config_files dlls/snmpapi/tests/Makefile"
 
+ac_config_files="$ac_config_files dlls/softpub/Makefile"
+
 ac_config_files="$ac_config_files dlls/spoolss/Makefile"
 
 ac_config_files="$ac_config_files dlls/spoolss/tests/Makefile"
@@ -22748,6 +22750,7 @@ do
     "dlls/slbcsp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/slbcsp/Makefile" ;;
     "dlls/snmpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/Makefile" ;;
     "dlls/snmpapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/tests/Makefile" ;;
+    "dlls/softpub/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/softpub/Makefile" ;;
     "dlls/spoolss/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/Makefile" ;;
     "dlls/spoolss/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/tests/Makefile" ;;
     "dlls/stdole2.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stdole2.tlb/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index c7aea29e1a2..58945f105a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1908,6 +1908,7 @@ AC_CONFIG_FILES([dlls/shlwapi/tests/Makefile])
 AC_CONFIG_FILES([dlls/slbcsp/Makefile])
 AC_CONFIG_FILES([dlls/snmpapi/Makefile])
 AC_CONFIG_FILES([dlls/snmpapi/tests/Makefile])
+AC_CONFIG_FILES([dlls/softpub/Makefile])
 AC_CONFIG_FILES([dlls/spoolss/Makefile])
 AC_CONFIG_FILES([dlls/spoolss/tests/Makefile])
 AC_CONFIG_FILES([dlls/stdole2.tlb/Makefile])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index d4fd82727e4..08b6840a62e 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -199,6 +199,7 @@ BASEDIRS = \
 	shlwapi \
 	slbcsp \
 	snmpapi \
+	softpub \
 	spoolss \
 	stdole2.tlb \
 	stdole32.tlb \
diff --git a/dlls/softpub/Makefile.in b/dlls/softpub/Makefile.in
new file mode 100644
index 00000000000..b62dae7ec4b
--- /dev/null
+++ b/dlls/softpub/Makefile.in
@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = softpub.dll
+IMPORTS   = kernel32
+
+C_SRCS = \
+	main.c
+
+@MAKE_DLL_RULES@
+
+@DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/softpub/main.c b/dlls/softpub/main.c
new file mode 100644
index 00000000000..bf9a6f5aada
--- /dev/null
+++ b/dlls/softpub/main.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2008 Maarten Lankhorst
+ *
+ * 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 "config.h"
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(softpub);
+
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+{
+    TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
+
+    switch (fdwReason)
+    {
+        case DLL_WINE_PREATTACH:
+            return FALSE;    /* prefer native version */
+        case DLL_PROCESS_ATTACH:
+            DisableThreadLibraryCalls(hinstDLL);
+            break;
+        case DLL_PROCESS_DETACH:
+            break;
+        default:
+            break;
+    }
+    return TRUE;
+}
diff --git a/dlls/softpub/softpub.spec b/dlls/softpub/softpub.spec
new file mode 100644
index 00000000000..620ae279c66
--- /dev/null
+++ b/dlls/softpub/softpub.spec
@@ -0,0 +1,24 @@
+1 stub GenericChainCertificateTrust
+2 stub GenericChainFinalProv
+3 stub HTTPSCertificateTrust
+4 stub SoftpubDefCertInit
+5 stub SoftpubFreeDefUsageCallData
+6 stub SoftpubLoadDefUsageCallData
+7 stub AddPersonalTrustDBPages
+8 stub DllRegisterServer
+9 stub DllUnregisterServer
+10 stub DriverCleanupPolicy
+11 stub DriverFinalPolicy
+12 stub DriverInitializePolicy
+13 stub FindCertsByIssuer
+14 stub HTTPSFinalProv
+15 stub OfficeCleanupPolicy
+16 stub OfficeInitializePolicy
+17 stub OpenPersonalTrustDBDialog
+18 stub SoftpubAuthenticode
+19 stub SoftpubCheckCert
+20 stub SoftpubCleanup
+21 stub SoftpubDumpStructure
+22 stub SoftpubInitialize
+23 stub SoftpubLoadMessage
+24 stub SoftpubLoadSignature