diff --git a/configure b/configure
index ace7d469b01..74f9849f86d 100755
--- a/configure
+++ b/configure
@@ -14970,6 +14970,7 @@ wine_fn_config_dll wintab32 enable_wintab32 wintab32
 wine_fn_config_test dlls/wintab32/tests wintab32_test
 wine_fn_config_dll wintrust enable_wintrust wintrust
 wine_fn_config_test dlls/wintrust/tests wintrust_test
+wine_fn_config_dll wlanapi enable_wlanapi
 wine_fn_config_dll wldap32 enable_wldap32 wldap32
 wine_fn_config_test dlls/wldap32/tests wldap32_test
 wine_fn_config_dll wmi enable_wmi
diff --git a/configure.ac b/configure.ac
index 85983d5dbbb..12603702f8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2748,6 +2748,7 @@ WINE_CONFIG_DLL(wintab32,,[wintab32])
 WINE_CONFIG_TEST(dlls/wintab32/tests)
 WINE_CONFIG_DLL(wintrust,,[wintrust])
 WINE_CONFIG_TEST(dlls/wintrust/tests)
+WINE_CONFIG_DLL(wlanapi)
 WINE_CONFIG_DLL(wldap32,,[wldap32])
 WINE_CONFIG_TEST(dlls/wldap32/tests)
 WINE_CONFIG_DLL(wmi)
diff --git a/dlls/wlanapi/Makefile.in b/dlls/wlanapi/Makefile.in
new file mode 100644
index 00000000000..12db8ca2af0
--- /dev/null
+++ b/dlls/wlanapi/Makefile.in
@@ -0,0 +1,6 @@
+MODULE = wlanapi.dll
+
+C_SRCS = \
+	main.c
+
+@MAKE_DLL_RULES@
diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c
new file mode 100644
index 00000000000..97ffd79dc81
--- /dev/null
+++ b/dlls/wlanapi/main.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010 Ričardas Barkauskas
+ *
+ * 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(wlanapi);
+
+
+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;
+    }
+
+    return TRUE;
+}
diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec
new file mode 100644
index 00000000000..670c41f5af9
--- /dev/null
+++ b/dlls/wlanapi/wlanapi.spec
@@ -0,0 +1,36 @@
+@ stub WlanAllocateMemory
+@ stub WlanCloseHandle
+@ stub WlanConnect
+@ stub WlanDeleteProfile
+@ stub WlanDisconnect
+@ stub WlanEnumInterfaces
+@ stub WlanExtractPsdIEDataList
+@ stub WlanFreeMemory
+@ stub WlanGetAvailableNetworkList
+@ stub WlanGetFilterList
+@ stub WlanGetInterfaceCapability
+@ stub WlanGetNetworkBssList
+@ stub WlanGetProfile
+@ stub WlanGetProfileCustomUserData
+@ stub WlanGetProfileList
+@ stub WlanGetSecuritySettings
+@ stub WlanIhvControl
+@ stub WlanOpenHandle
+@ stub WlanQueryAutoConfigParameter
+@ stub WlanQueryInterface
+@ stub WlanReasonCodeToString
+@ stub WlanRegisterNotification
+@ stub WlanRenameProfile
+@ stub WlanSaveTemporaryProfile
+@ stub WlanScan
+@ stub WlanSetAutoConfigParameter
+@ stub WlanSetFilterList
+@ stub WlanSetInterface
+@ stub WlanSetProfile
+@ stub WlanSetProfileCustomUserData
+@ stub WlanSetProfileEapUserData
+@ stub WlanSetProfileEapXmlUserData
+@ stub WlanSetProfileList
+@ stub WlanSetProfilePosition
+@ stub WlanSetPsdIEDataList
+@ stub WlanSetSecuritySettings