diff --git a/src/add-ons/kernel/file_systems/udf/Jamfile b/src/add-ons/kernel/file_systems/udf/Jamfile
index d2dfcc4c52..22a4365b01 100644
--- a/src/add-ons/kernel/file_systems/udf/Jamfile
+++ b/src/add-ons/kernel/file_systems/udf/Jamfile
@@ -14,7 +14,7 @@ oldOPTIM = $(OPTIM) ;
 	}
 
 	if $(DEBUG) {
-		defines += DEBUG ;
+		#defines += DEBUG ;
 	} else {
 		# the gcc on BeOS doesn't compile BFS correctly with -O2 or more
 		OPTIM = -O1 ;
@@ -29,10 +29,11 @@ R5KernelAddon udf : [ FDirName kernel file_systems udf ] :
 	cpp.cpp
 	vfs_interface.cpp
 
-	Debug.cpp
+	UdfDebug.cpp
 	DiskStructures.cpp
 	Volume.cpp
 ;
+LinkSharedOSLibs udf : /boot/beos/system/lib/libroot.so ;
 
 rule InstallUDF
 {
diff --git a/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
index 2867812a21..0e5d1fe165 100644
--- a/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
@@ -9,20 +9,22 @@ SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems udf ;
 	SubDirC++Flags $(defines) -fno-exceptions -fno-rtti ; #-fcheck-memory-usage
 }
 
+NO_TEST_DEBUG = true ;
+
 SimpleTest udf_shell
 	:
 	fsh.c rootfs.c initfs.c kernel.c cache.c sl.c stub.c
 	sysdep.c hexdump.c argv.c 
 
 	cpp.cpp vfs_interface.cpp
-	Debug.cpp DiskStructures.cpp Volume.cpp 
+	UdfDebug.cpp DiskStructures.cpp Volume.cpp 
 	:
 	;
 
 # Tell Jam where to find these sources
 SEARCH on [ FGristFiles
 		cpp.cpp vfs_interface.cpp 
-		Debug.cpp DiskStructures.cpp Volume.cpp 
+		UdfDebug.cpp DiskStructures.cpp Volume.cpp 
 	] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems udf ] ;
 
 SEARCH on [ FGristFiles