diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 48dad91a23..6c1f67a871 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -187,7 +187,7 @@ SYSTEM_ADD_ONS_BUS_MANAGERS =  $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
 	$(IDE_ONLY)ide scsi config_manager agp_gart usb firewire $(X86_ONLY)acpi
 ;
 SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
-	write_overlay ntfs reiserfs ; #googlefs
+	write_overlay ntfs reiserfs udf ; #googlefs
 
 
 # modules
diff --git a/src/add-ons/kernel/file_systems/udf/Jamfile b/src/add-ons/kernel/file_systems/udf/Jamfile
index c05d914a78..2899419cda 100644
--- a/src/add-ons/kernel/file_systems/udf/Jamfile
+++ b/src/add-ons/kernel/file_systems/udf/Jamfile
@@ -1,22 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel file_systems udf ;
 
-SetSubDirSupportedPlatformsBeOSCompatible ;
 SubDirC++Flags -fno-rtti ;
 
-# save original optimization level
-oldOPTIM = $(OPTIM) ;
-
-# set some additional defines
-{
-	local defines =
-		KEEP_WRONG_DIRENT_RECLEN
-		;
-
-	defines = [ FDefines $(defines) ] ;
-	SubDirCcFlags $(defines) -Wall -Wno-multichar ;
-	SubDirC++Flags $(defines) -Wall -Wno-multichar -fno-rtti ;
-}
-
 UsePrivateKernelHeaders ;
 
 KernelAddon udf :
@@ -32,29 +17,6 @@ KernelAddon udf :
 	Utils.cpp
 	VirtualPartition.cpp
 	Volume.cpp
-	
-	kernel_cpp.cpp 
+
 	kernel_interface.cpp
-	;
-
-SEARCH on [ FGristFiles
-		kernel_cpp.cpp 
-	] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
-
-
-rule InstallUDF
-{
-	Depends $(<) : $(>) ;
-}
-
-actions ignore InstallUDF
-{
-	cp $(>) /boot/home/config/add-ons/kernel/file_systems/
-}
-
-InstallUDF install : udf ;
-
-# restore original optimization level
-OPTIM = $(oldOPTIM) ;
-
-#SubInclude HAIKU_TOP src add-ons kernel file_systems udf drive_setup_addon ;
+;
diff --git a/src/add-ons/kernel/file_systems/udf/kernel_interface.cpp b/src/add-ons/kernel/file_systems/udf/kernel_interface.cpp
index a3383da981..622685654c 100644
--- a/src/add-ons/kernel/file_systems/udf/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/udf/kernel_interface.cpp
@@ -26,7 +26,7 @@
 
 #undef TRACE
 #undef TRACE_ERROR
-#define UDF_KERNEL_INTERFACE_DEBUG
+//#define UDF_KERNEL_INTERFACE_DEBUG
 #ifdef UDF_KERNEL_INTERFACE_DEBUG
 #	define TRACE(x)			dprintf x
 #	define TRACE_ERROR(x)	dprintf x