diff --git a/reactos/baseaddress.rbuild b/reactos/baseaddress.rbuild
index 567666925f2..ca9b987e67d 100644
--- a/reactos/baseaddress.rbuild
+++ b/reactos/baseaddress.rbuild
@@ -10,6 +10,7 @@
   <property name="BASEADDRESS_RSABASE" value="0x35700000" />
   <property name="BASEADDRESS_RSAENH" value="0x35780000" />
   <property name="BASEADDRESS_URL" value="0x42ea0000" />
+  <property name="BASEADDRESS_WLANAPI" value="0x470F0000" />
   <property name="BASEADDRESS_DWMAPI" value="0x4A3F0000" />
   <property name="BASEADDRESS_LOADPERF" value="0x4B920000" />
   <property name="BASEADDRESS_MPRAPI" value="0x4C400000" />
diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 67f62e4172d..a3504535d5d 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -410,6 +410,7 @@ dll\win32\wininet\wininet.dll                       1
 dll\win32\winmm\winmm.dll                           1
 dll\win32\winspool\winspool.drv                     1
 dll\win32\winsta\winsta.dll                         1
+dll\win32\wlanapi\wlanapi.dll                       1
 dll\win32\wintrust\wintrust.dll                     1
 dll\win32\wldap32\wldap32.dll                       1
 dll\win32\wmi\wmi.dll                               1
diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild
index 657de9b9563..bbeaec32642 100644
--- a/reactos/dll/win32/win32.rbuild
+++ b/reactos/dll/win32/win32.rbuild
@@ -538,6 +538,9 @@
 <directory name="wintrust">
 	<xi:include href="wintrust/wintrust.rbuild" />
 </directory>
+<directory name="wlanapi">
+	<xi:include href="wlanapi/wlanapi.rbuild" />
+</directory>
 <directory name="wldap32">
 	<xi:include href="wldap32/wldap32.rbuild" />
 </directory>
diff --git a/reactos/dll/win32/wlanapi/main.c b/reactos/dll/win32/wlanapi/main.c
new file mode 100644
index 00000000000..d81f14b0905
--- /dev/null
+++ b/reactos/dll/win32/wlanapi/main.c
@@ -0,0 +1,38 @@
+/*
+ * Wireless LAN API (wlanapi.dll)
+ *
+ * Copyright 2009 Christoph von Wittich (Christoph@ApiViewer.de)
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <windows.h>
+#include <wlanapi.h>
+
+
+PVOID
+WINAPI
+WlanAllocateMemory(IN DWORD dwSize)
+{
+    return HeapAlloc(GetProcessHeap(), 0, dwSize);
+}
+
+VOID
+WINAPI
+WlanFreeMemory(IN PVOID pMem)
+{
+    HeapFree(GetProcessHeap(), 0, pMem);
+}
+
diff --git a/reactos/dll/win32/wlanapi/wlanapi.rbuild b/reactos/dll/win32/wlanapi/wlanapi.rbuild
new file mode 100644
index 00000000000..8a1c6433a77
--- /dev/null
+++ b/reactos/dll/win32/wlanapi/wlanapi.rbuild
@@ -0,0 +1,9 @@
+<module name="wlanapi" type="win32dll" baseaddress="${BASEADDRESS_WLANAPI}" installbase="system32" installname="wlanapi.dll" entrypoint="0">
+	<importlibrary definition="wlanapi.spec" />
+	<include base="wlanapi">.</include>
+	<library>kernel32</library>
+	<library>ntdll</library>
+	<file>main.c</file>
+	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
+	<compilerflag>-fno-unit-at-a-time</compilerflag>
+</module>
diff --git a/reactos/dll/win32/wlanapi/wlanapi.spec b/reactos/dll/win32/wlanapi/wlanapi.spec
new file mode 100644
index 00000000000..e94dd532867
--- /dev/null
+++ b/reactos/dll/win32/wlanapi/wlanapi.spec
@@ -0,0 +1,36 @@
+@ stdcall WlanAllocateMemory (long)
+@ stub WlanCloseHandle
+@ stub WlanConnect
+@ stub WlanDeleteProfile
+@ stub WlanDisconnect
+@ stub WlanEnumInterfaces
+@ stub WlanExtractPsdIEDataList
+@ stdcall WlanFreeMemory (ptr)
+@ 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
diff --git a/reactos/include/psdk/wlanapi.h b/reactos/include/psdk/wlanapi.h
new file mode 100644
index 00000000000..5ba7628628e
--- /dev/null
+++ b/reactos/include/psdk/wlanapi.h
@@ -0,0 +1,16 @@
+#ifndef _WLANAPI_H
+#define _WLANAPI_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+PVOID WINAPI WlanAllocateMemory(DWORD dwSize);
+VOID WINAPI WlanFreeMemory(PVOID pMemory);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif  // _WLANAPI_H