diff --git a/configure b/configure
index e2f43ff4e4e..4c3cd847907 100755
--- a/configure
+++ b/configure
@@ -14755,6 +14755,7 @@ wine_fn_config_dll advpack enable_advpack implib
 wine_fn_config_test dlls/advpack/tests advpack_test
 wine_fn_config_dll amstream enable_amstream
 wine_fn_config_test dlls/amstream/tests amstream_test
+wine_fn_config_dll apphelp enable_apphelp
 wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po
 wine_fn_config_dll atl enable_atl implib
 wine_fn_config_test dlls/atl/tests atl_test
diff --git a/configure.ac b/configure.ac
index 4ca249355ed..1340757bcfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2373,6 +2373,7 @@ WINE_CONFIG_DLL(advpack,,[implib])
 WINE_CONFIG_TEST(dlls/advpack/tests)
 WINE_CONFIG_DLL(amstream)
 WINE_CONFIG_TEST(dlls/amstream/tests)
+WINE_CONFIG_DLL(apphelp)
 WINE_CONFIG_DLL(appwiz.cpl,,[po])
 WINE_CONFIG_DLL(atl,,[implib])
 WINE_CONFIG_TEST(dlls/atl/tests)
diff --git a/dlls/apphelp/Makefile.in b/dlls/apphelp/Makefile.in
new file mode 100644
index 00000000000..ce5de56a00d
--- /dev/null
+++ b/dlls/apphelp/Makefile.in
@@ -0,0 +1,5 @@
+MODULE = apphelp.dll
+
+C_SRCS = apphelp.c
+
+@MAKE_DLL_RULES@
diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c
new file mode 100644
index 00000000000..bed3f5c8a51
--- /dev/null
+++ b/dlls/apphelp/apphelp.c
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2011 André Hentschel
+ *
+ * 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(apphelp);
+
+BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
+{
+    TRACE("%p, %u, %p\n", hinst, reason, reserved);
+
+    switch (reason)
+    {
+        case DLL_WINE_PREATTACH:
+            return FALSE;    /* prefer native version */
+        case DLL_PROCESS_ATTACH:
+            DisableThreadLibraryCalls( hinst );
+            break;
+        case DLL_PROCESS_DETACH:
+            break;
+    }
+    return TRUE;
+}
diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec
new file mode 100644
index 00000000000..a6ecf7ff4ba
--- /dev/null
+++ b/dlls/apphelp/apphelp.spec
@@ -0,0 +1,167 @@
+@ stub AllowPermLayer
+@ stub ApphelpCheckExe
+@ stub ApphelpCheckInstallShieldPackage
+@ stub ApphelpCheckMsiPackage
+@ stub ApphelpCheckRunApp
+@ stub ApphelpCheckRunAppEx
+@ stub ApphelpCheckShellObject
+@ stub ApphelpCreateAppcompatData
+@ stub ApphelpFixMsiPackage
+@ stub ApphelpFixMsiPackageExe
+@ stub ApphelpFreeFileAttributes
+@ stub ApphelpGetFileAttributes
+@ stub ApphelpGetMsiProperties
+@ stub ApphelpGetNTVDMInfo
+@ stub ApphelpParseModuleData
+@ stub ApphelpQueryModuleData
+@ stub ApphelpQueryModuleDataEx
+@ stub ApphelpUpdateCacheEntry
+@ stub GetPermLayers
+@ stub SdbAddLayerTagRefToQuery
+@ stub SdbApphelpNotify
+@ stub SdbApphelpNotifyExSdbApphelpNotifyEx
+@ stub SdbBuildCompatEnvVariables
+@ stub SdbCloseApphelpInformation
+@ stub SdbCloseDatabase
+@ stub SdbCloseDatabaseWrite
+@ stub SdbCloseLocalDatabase
+@ stub SdbCommitIndexes
+@ stub SdbCreateDatabase
+@ stub SdbCreateHelpCenterURL
+@ stub SdbCreateMsiTransformFile
+@ stub SdbDeclareIndex
+@ stub SdbDumpSearchPathPartCaches
+@ stub SdbEnumMsiTransforms
+@ stub SdbEscapeApphelpURL
+@ stub SdbFindFirstDWORDIndexedTag
+@ stub SdbFindFirstMsiPackage
+@ stub SdbFindFirstMsiPackage_Str
+@ stub SdbFindFirstNamedTag
+@ stub SdbFindFirstStringIndexedTag
+@ stub SdbFindFirstTag
+@ stub SdbFindFirstTagRef
+@ stub SdbFindNextDWORDIndexedTag
+@ stub SdbFindNextMsiPackage
+@ stub SdbFindNextStringIndexedTag
+@ stub SdbFindNextTag
+@ stub SdbFindNextTagRef
+@ stub SdbFreeDatabaseInformation
+@ stub SdbFreeFileInfo
+@ stub SdbFreeFlagInfo
+@ stub SdbGetAppCompatDataSize
+@ stub SdbGetAppPatchDir
+@ stub SdbGetBinaryTagData
+@ stub SdbGetDatabaseID
+@ stub SdbGetDatabaseInformation
+@ stub SdbGetDatabaseInformationByName
+@ stub SdbGetDatabaseMatch
+@ stub SdbGetDatabaseVersion
+@ stub SdbGetDllPath
+@ stub SdbGetEntryFlags
+@ stub SdbGetFileAttributes
+@ stub SdbGetFileImageType
+@ stub SdbGetFileImageTypeEx
+@ stub SdbGetFileInfo
+@ stub SdbGetFirstChild
+@ stub SdbGetIndex
+@ stub SdbGetItemFromItemRef
+@ stub SdbGetLayerName
+@ stub SdbGetLayerTagRef
+@ stub SdbGetLocalPDB
+@ stub SdbGetMatchingExe
+@ stub SdbGetMsiPackageInformation
+@ stub SdbGetNamedLayer
+@ stub SdbGetNextChild
+@ stub SdbGetNthUserSdb
+@ stub SdbGetPermLayerKeys
+@ stub SdbGetShowDebugInfoOption
+@ stub SdbGetShowDebugInfoOptionValue
+@ stub SdbGetStandardDatabaseGUID
+@ stub SdbGetStringTagPtr
+@ stub SdbGetTagFromTagID
+@ stub SdbGrabMatchingInfo
+@ stub SdbGrabMatchingInfoEx
+@ stub SdbGUIDFromString
+@ stub SdbGUIDToString
+@ stub SdbInitDatabase
+@ stub SdbInitDatabaseEx
+@ stub SdbIsNullGUID
+@ stub SdbIsStandardDatabase
+@ stub SdbIsTagrefFromLocalDB
+@ stub SdbIsTagrefFromMainDB
+@ stub SdbLoadString
+@ stub SdbMakeIndexKeyFromString
+@ stub SdbOpenApphelpDetailsDatabase
+@ stub SdbOpenApphelpDetailsDatabaseSP
+@ stub SdbOpenApphelpInformation
+@ stub SdbOpenApphelpInformationByID
+@ stub SdbOpenApphelpResourceFile
+@ stub SdbOpenDatabase
+@ stub SdbOpenDbFromGuid
+@ stub SdbOpenLocalDatabase
+@ stub SdbPackAppCompatData
+@ stub SdbQueryApphelpInformation
+@ stub SdbQueryBlockUpgrade
+@ stub SdbQueryContext
+@ stub SdbQueryData
+@ stub SdbQueryDataEx
+@ stub SdbQueryDataExTagID
+@ stub SdbQueryFlagInfo
+@ stub SdbQueryName
+@ stub SdbQueryReinstallUpgrade
+@ stub SdbReadApphelpData
+@ stub SdbReadApphelpDetailsData
+@ stub SdbReadBinaryTag
+@ stub SdbReadBYTETag
+@ stub SdbReadDWORDTagRef
+@ stub SdbReadEntryInformation
+@ stub SdbReadMsiTransformInfo
+@ stub SdbReadPatchBits
+@ stub SdbReadQWORDTag
+@ stub SdbReadQWORDTagRef
+@ stub SdbReadStringTag
+@ stub SdbReadStringTagRef
+@ stub SdbReadWORDTagRef
+@ stub SdbRegisterDatabase
+@ stub SdbReleaseDatabase
+@ stub SdbReleaseMatchingExe
+@ stub SdbResolveDatabase
+@ stub SdbSetApphelpDebugParameters
+@ stub SdbSetEntryFlags
+@ stub SdbSetImageType
+@ stub SdbSetPermLayerKeys
+@ stub SdbShowApphelpDialog
+@ stub SdbShowApphelpFromQuery
+@ stub SdbStartIndexing
+@ stub SdbStopIndexing
+@ stub SdbStringDuplicate
+@ stub SdbStringReplace
+@ stub SdbStringReplaceArray
+@ stub SdbTagIDToTagRef
+@ stub SdbTagToString
+@ stub SdbUnregisterDatabase
+@ stub SdbWriteBinaryTag
+@ stub SdbWriteBinaryTagFromFile
+@ stub SdbWriteBYTETag
+@ stub SdbWriteDWORDTag
+@ stub SdbWriteNULLTag
+@ stub SdbWriteQWORDTag
+@ stub SdbWriteStringRefTag
+@ stub SdbWriteStringTag
+@ stub SdbWriteStringTagDirect
+@ stub SdbWriteWORDTag
+@ stub SE_DllLoaded
+@ stub SE_DllUnloaded
+@ stub SE_GetHookAPIs
+@ stub SE_GetMaxShimCount
+@ stub SE_GetProcAddressLoad
+@ stub SE_GetShimCount
+@ stub SE_InstallAfterInit
+@ stub SE_InstallBeforeInit
+@ stub SE_IsShimDll
+@ stub SE_LdrEntryRemoved
+@ stub SE_ProcessDying
+@ stub SetPermLayers
+@ stub ShimDbgPrint
+@ stub ShimDumpCache
+@ stub ShimFlushCache