diff --git a/reactos/lib/dnsapi/.cvsignore b/reactos/lib/dnsapi/.cvsignore
new file mode 100644
index 00000000000..3fb11027a41
--- /dev/null
+++ b/reactos/lib/dnsapi/.cvsignore
@@ -0,0 +1,11 @@
+*.coff
+*.dll
+*.d
+*.o
+*.sym
+*.dsp
+*.dsw
+*.ncb
+*.opt
+*.txt
+*.map
diff --git a/reactos/lib/dnsapi/Makefile b/reactos/lib/dnsapi/Makefile
new file mode 100644
index 00000000000..8b3e4e90b65
--- /dev/null
+++ b/reactos/lib/dnsapi/Makefile
@@ -0,0 +1,34 @@
+# $Id: Makefile,v 1.1 2003/12/18 10:54:48 arty Exp $
+
+PATH_TO_TOP = ../..
+
+TARGET_DEFONLY = yes
+
+TARGET_TYPE = dynlink
+
+TARGET_NAME = dnsapi
+
+TARGET_BASE = 0x78000000
+
+TARGET_LFLAGS = -nostartfiles
+
+TARGET_SDKLIBS = adns.a kernel32.a iphlpapi.a ws2_32.a msvcrt.a ntdll.a \
+	rosrtl.a
+
+TARGET_GCCLIBS = gcc
+
+TARGET_CFLAGS = -Werror -Wall -I$(PATH_TO_TOP)/lib/adns/src -Iinclude \
+	-I$(PATH_TO_TOP)/lib/adns/adns_win32
+
+# require os code to explicitly request A/W version of structs/functions
+TARGET_CFLAGS += -D_DISABLE_TIDENTS -DADNS_JGAA_WIN32
+
+TARGET_OBJECTS = \
+	dnsapi/context.o dnsapi/names.o dnsapi/query.o dnsapi/free.o \
+	dnsapi/adns.o
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+# EOF
diff --git a/reactos/lib/dnsapi/dnsapi.def b/reactos/lib/dnsapi/dnsapi.def
new file mode 100644
index 00000000000..207d64010e3
--- /dev/null
+++ b/reactos/lib/dnsapi/dnsapi.def
@@ -0,0 +1,32 @@
+;
+; dnsapi.def
+;
+; ReactOS Operating System
+;
+; Dns... API functions.
+;
+LIBRARY dnsapi.dll
+EXPORTS
+; Names
+; DnsValidateName
+DnsValidateName_W@8
+DnsValidateName_UTF8@8
+DnsValidateName_A@8
+; DnsNameCompare
+DnsNameCompare_W@8
+DnsNameCompare_UTF8@8
+DnsNameCompare_A@8
+; Contexts
+; DnsAcquireContextHandle
+DnsAcquireContextHandle_W@12
+DnsAcquireContextHandle_UTF8@12
+DnsAcquireContextHandle_A@12
+; DnsReleaseContextHandle
+DnsReleaseContextHandle@4
+; Queries
+DnsQuery_W@24
+DnsQuery_UTF8@24
+DnsQuery_A@24
+; Free
+DnsFree@8
+DnsRecordListFree@8
\ No newline at end of file
diff --git a/reactos/lib/dnsapi/dnsapi.edf b/reactos/lib/dnsapi/dnsapi.edf
new file mode 100644
index 00000000000..5195b9c8f54
--- /dev/null
+++ b/reactos/lib/dnsapi/dnsapi.edf
@@ -0,0 +1,32 @@
+;
+; dnsapi.def
+;
+; ReactOS Operating System
+;
+; Dns... API functions.
+;
+LIBRARY dnsapi.dll
+EXPORTS
+; Names
+; DnsValidateName
+DnsValidateName_W=DnsValidateName_W@8
+DnsValidateName_UTF8=DnsValidateName_UTF8@8
+DnsValidateName_A=DnsValidateName_A@8
+; DnsNameCompare
+DnsNameCompare_W=DnsNameCompare_W@8
+DnsNameCompare_UTF8=DnsNameCompare_UTF8@8
+DnsNameCompare_A=DnsNameCompare_A@8
+; Contexts
+; DnsAcquireContextHandle
+DnsAcquireContextHandle_W=DnsAcquireContextHandle_W@12
+DnsAcquireContextHandle_UTF8=DnsAcquireContextHandle_UTF8@12
+DnsAcquireContextHandle_A=DnsAcquireContextHandle_A@12
+; DnsReleaseContextHandle
+DnsReleaseContextHandle=DnsReleaseContextHandle@4
+; Queries
+DnsQuery_W=DnsQuery_W@24
+DnsQuery_UTF8=DnsQuery_UTF8@24
+DnsQuery_A=DnsQuery_A@24
+; Free
+DnsFree=DnsFree@8
+DnsRecordListFree=DnsRecordListFree@8
\ No newline at end of file
diff --git a/reactos/lib/dnsapi/dnsapi.rc b/reactos/lib/dnsapi/dnsapi.rc
new file mode 100644
index 00000000000..9bf851c8a89
--- /dev/null
+++ b/reactos/lib/dnsapi/dnsapi.rc
@@ -0,0 +1,37 @@
+#include <defines.h>
+#include <reactos/resource.h>
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+VS_VERSION_INFO VERSIONINFO
+	FILEVERSION	RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
+	PRODUCTVERSION	RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD
+	FILEFLAGSMASK	0x3fL
+#ifdef _DEBUG
+	FILEFLAGS	0x1L
+#else
+	FILEFLAGS	0x0L
+#endif
+	FILEOS		0x40004L
+	FILETYPE	0x2L
+	FILESUBTYPE	0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName",	RES_STR_COMPANY_NAME
+            VALUE "FileDescription",	"DNSAPI.DLL Library\0"
+            VALUE "FileVersion",	RES_STR_FILE_VERSION
+            VALUE "InternalName",	"dnsapi\0"
+            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",	"dnsapi.dll\0"
+            VALUE "ProductName",	RES_STR_PRODUCT_NAME
+            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/reactos/lib/dnsapi/include/internal/windns.h b/reactos/lib/dnsapi/include/internal/windns.h
new file mode 100644
index 00000000000..f297d3a26f3
--- /dev/null
+++ b/reactos/lib/dnsapi/include/internal/windns.h
@@ -0,0 +1,13 @@
+#ifndef WINDNS_INTERNAL_H
+#define WINDNS_INTERNAL_H
+
+#include "adns.h"
+
+typedef struct {
+  adns_state State;
+} WINDNS_CONTEXT, *PWINDNS_CONTEXT;
+
+DNS_STATUS DnsIntTranslateAdnsToDNS_STATUS( int Status );
+void DnsIntFreeRecordList( PDNS_RECORDA ToFree );
+
+#endif//WINDNS_INTERNAL_H