diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index 6e96af3f4c0..df765fa0889 100644
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-16  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+	* lib/user32/include/debug.h (ASSERT): Don't call KeBugCheck.
+	* lib/user32/misc/dllmain.c (KeBugCheck): Remove declaration.
+
 2004-08-16  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
 	* drivers/net/tcpip/include/.cvsignore: New file.
diff --git a/reactos/lib/user32/include/debug.h b/reactos/lib/user32/include/debug.h
index c86cfac42b1..92abc6d0391 100644
--- a/reactos/lib/user32/include/debug.h
+++ b/reactos/lib/user32/include/debug.h
@@ -38,7 +38,7 @@ extern DWORD DebugTraceLevel;
 #ifdef NASSERT
 #define ASSERT(x)
 #else /* NASSERT */
-#define ASSERT(x) if (!(x)) { D(MIN_TRACE, ("Assertion "#x" failed at %s:%d\n", __FILE__, __LINE__)); KeBugCheck(0); }
+#define ASSERT(x) if (!(x)) { D(MIN_TRACE, ("Assertion "#x" failed at %s:%d\n", __FILE__, __LINE__)); }
 #endif /* NASSERT */
 
 #define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x))
diff --git a/reactos/lib/user32/misc/dllmain.c b/reactos/lib/user32/misc/dllmain.c
index a05b417c0e0..8dee1fce82b 100644
--- a/reactos/lib/user32/misc/dllmain.c
+++ b/reactos/lib/user32/misc/dllmain.c
@@ -23,9 +23,6 @@ extern CRITICAL_SECTION gcsMPH;
 static ULONG User32TlsIndex;
 HINSTANCE User32Instance;
 
-/* To make the linker happy */
-VOID STDCALL KeBugCheck (ULONG	BugCheckCode) {}
-
 HWINSTA ProcessWindowStation;
 
 PUSER32_THREAD_DATA