diff --git a/reactos/lib/ntdll/def/ntdll.def b/reactos/lib/ntdll/def/ntdll.def
index 1b64289a368..c545ab9e4a8 100644
--- a/reactos/lib/ntdll/def/ntdll.def
+++ b/reactos/lib/ntdll/def/ntdll.def
@@ -1,4 +1,4 @@
-; $Id: ntdll.def,v 1.125 2004/07/15 08:15:20 ekohl Exp $
+; $Id: ntdll.def,v 1.126 2004/08/09 18:17:22 jimtabor Exp $
 ;
 ; ReactOS Operating System
 ;
@@ -351,7 +351,7 @@ RtlCreateEnvironment@8
 RtlCreateHeap@24
 RtlCreateProcessParameters@40
 ;RtlCreatePropertySet
-;RtlCreateQueryDebugBuffer
+RtlCreateQueryDebugBuffer@8
 RtlCreateRegistryKey@8
 RtlCreateSecurityDescriptor@8
 ;RtlCreateTagHeap
@@ -388,7 +388,7 @@ RtlDestroyEnvironment@4
 RtlDestroyHandleTable@4
 RtlDestroyHeap@4
 RtlDestroyProcessParameters@4
-;RtlDestroyQueryDebugBuffer
+RtlDestroyQueryDebugBuffer@4
 RtlDetermineDosPathNameType_U@4
 RtlDoesFileExists_U@4
 RtlDosPathNameToNtPathName_U@16
@@ -547,7 +547,7 @@ RtlQueryAtomInAtomTable@24
 RtlQueryEnvironmentVariable_U@12
 RtlQueryInformationAcl@16
 ;RtlQueryProcessBackTraceInformation
-;RtlQueryProcessDebugInformation
+RtlQueryProcessDebugInformation@12
 ;RtlQueryProcessHeapInformation
 ;RtlQueryProcessLockInformation
 ;RtlQueryProperties
diff --git a/reactos/lib/ntdll/def/ntdll.edf b/reactos/lib/ntdll/def/ntdll.edf
index 356d63b8006..aeb1b32ae9d 100644
--- a/reactos/lib/ntdll/def/ntdll.edf
+++ b/reactos/lib/ntdll/def/ntdll.edf
@@ -1,4 +1,4 @@
-; $Id: ntdll.edf,v 1.115 2004/07/15 08:15:21 ekohl Exp $
+; $Id: ntdll.edf,v 1.116 2004/08/09 18:17:22 jimtabor Exp $
 ;
 ; ReactOS Operating System
 ;
@@ -351,7 +351,7 @@ RtlCreateEnvironment=RtlCreateEnvironment@8
 RtlCreateHeap=RtlCreateHeap@24
 RtlCreateProcessParameters=RtlCreateProcessParameters@40
 ;RtlCreatePropertySet
-;RtlCreateQueryDebugBuffer
+RtlCreateQueryDebugBuffer=RtlCreateQueryDebugBuffer@8
 RtlCreateRegistryKey=RtlCreateRegistryKey@8
 RtlCreateSecurityDescriptor=RtlCreateSecurityDescriptor@8
 ;RtlCreateTagHeap
@@ -388,7 +388,7 @@ RtlDestroyEnvironment=RtlDestroyEnvironment@4
 RtlDestroyHandleTable=RtlDestroyHandleTable@4
 RtlDestroyHeap=RtlDestroyHeap@4
 RtlDestroyProcessParameters=RtlDestroyProcessParameters@4
-;RtlDestroyQueryDebugBuffer
+RtlDestroyQueryDebugBuffer=RtlDestroyQueryDebugBuffer@4
 RtlDetermineDosPathNameType_U=RtlDetermineDosPathNameType_U@4
 RtlDoesFileExists_U=RtlDoesFileExists_U@4
 RtlDosPathNameToNtPathName_U=RtlDosPathNameToNtPathName_U@16
@@ -548,7 +548,7 @@ RtlQueryAtomInAtomTable=RtlQueryAtomInAtomTable@24
 RtlQueryEnvironmentVariable_U=RtlQueryEnvironmentVariable_U@12
 RtlQueryInformationAcl=RtlQueryInformationAcl@16
 ;RtlQueryProcessBackTraceInformation
-;RtlQueryProcessDebugInformation
+RtlQueryProcessDebugInformation=RtlQueryProcessDebugInformation@12
 ;RtlQueryProcessHeapInformation
 ;RtlQueryProcessLockInformation
 ;RtlQueryProperties
diff --git a/reactos/lib/ntdll/makefile b/reactos/lib/ntdll/makefile
index 58585e0afd4..16fa847cd89 100644
--- a/reactos/lib/ntdll/makefile
+++ b/reactos/lib/ntdll/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.106 2004/07/08 00:40:31 weiden Exp $
+# $Id: makefile,v 1.107 2004/08/09 18:17:22 jimtabor Exp $
 
 PATH_TO_TOP = ../..
 
@@ -64,6 +64,7 @@ RTL_OBJECTS = \
 	rtl/access.o \
 	rtl/apc.o \
 	rtl/atom.o \
+	rtl/dbgbuffer.o \
 	rtl/bitmap.o \
 	rtl/callback.o \
 	rtl/crc32.o \
diff --git a/reactos/lib/ntdll/rtl/dbgbuffer.c b/reactos/lib/ntdll/rtl/dbgbuffer.c
new file mode 100644
index 00000000000..bc311f8f415
--- /dev/null
+++ b/reactos/lib/ntdll/rtl/dbgbuffer.c
@@ -0,0 +1,57 @@
+/*
+ *  ReactOS kernel
+ *  Copyright (C) 2004 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id:
+ *
+ * PROJECT:           ReactOS kernel
+ * PURPOSE:           User-mode Debug Buffer support
+ * FILE:              lib/ntdll/rtl/dbgbuffer.c
+ * PROGRAMER:         James Tabor
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <ntos/types.h>
+#include <napi/teb.h>
+#include <ntdll/rtl.h>
+#include <ddk/ntddk.h>
+
+/* FUNCTIONS ***************************************************************/
+
+PDEBUG_BUFFER STDCALL
+RtlCreateQueryDebugBuffer(IN ULONG Size,
+                          IN BOOLEAN EventPair)
+{
+	return(0);
+}
+
+NTSTATUS STDCALL
+RtlDestroyQueryDebugBuffer(IN PDEBUG_BUFFER Buf)
+{
+	return(0);
+}
+
+NTSTATUS STDCALL 
+RtlQueryProcessDebugInformation(IN ULONG ProcessId, 
+                                IN ULONG DebugInfoMask, 
+                                IN OUT PDEBUG_BUFFER Buf)
+{
+	return (0);
+}
+
+