diff --git a/src/add-ons/kernel/file_systems/udf/AllocationDescriptorList.h b/src/add-ons/kernel/file_systems/udf/AllocationDescriptorList.h
index f8941171f9..a2bb26c0c5 100644
--- a/src/add-ons/kernel/file_systems/udf/AllocationDescriptorList.h
+++ b/src/add-ons/kernel/file_systems/udf/AllocationDescriptorList.h
@@ -63,7 +63,7 @@ public:
 	*/
 	status_t FindExtent(off_t start, udf_long_address *extent, bool *isEmpty) {
 		DEBUG_INIT_ETC(CF_PUBLIC | CF_FILE_OPS | CF_HIGH_VOLUME, "AllocationDescriptorList<>",
-		               ("start: %lld, extent: %p, isEmpty: %p", start, extent, isEmpty));
+		               ("start: %Ld, extent: %p, isEmpty: %p", start, extent, isEmpty));
 		off_t startBlock = start >> fVolume->BlockShift();
 	
 		// This should never have to happen, as FindExtent is only called by
diff --git a/src/add-ons/kernel/file_systems/udf/CachedBlock.h b/src/add-ons/kernel/file_systems/udf/CachedBlock.h
index 59e56d38eb..a46b326916 100644
--- a/src/add-ons/kernel/file_systems/udf/CachedBlock.h
+++ b/src/add-ons/kernel/file_systems/udf/CachedBlock.h
@@ -106,7 +106,7 @@ CachedBlock::Unset()
 {
 	DEBUG_INIT(CF_HIGH_VOLUME | CF_PUBLIC, "CachedBlock");
 	if (fBlock) {
-		PRINT(("releasing block #%lld\n", BlockNumber()));	
+		PRINT(("releasing block #%Ld\n", BlockNumber()));	
 		release_block(fVolume->Device(), fBlockNumber);
 	} else {
 		PRINT(("no block to release\n"));
@@ -116,11 +116,11 @@ CachedBlock::Unset()
 inline uint8 *
 CachedBlock::SetTo(off_t block, bool empty = false)
 {
-	DEBUG_INIT_ETC(CF_HIGH_VOLUME | CF_PUBLIC, "CachedBlock", ("block: %lld, empty: %s",
+	DEBUG_INIT_ETC(CF_HIGH_VOLUME | CF_PUBLIC, "CachedBlock", ("block: %Ld, empty: %s",
 	               block, (empty ? "true" : "false")));
 	Unset();
 	fBlockNumber = block;
-	PRINT(("getting block #%lld\n", block));
+	PRINT(("getting block #%Ld\n", block));
 	return fBlock = empty ? (uint8 *)get_empty_block(fVolume->Device(), block, BlockSize())
 						  : (uint8 *)get_block(fVolume->Device(), block, BlockSize());
 }
diff --git a/src/add-ons/kernel/file_systems/udf/DirectoryIterator.cpp b/src/add-ons/kernel/file_systems/udf/DirectoryIterator.cpp
index 3df08aec54..ba0c97b8e1 100644
--- a/src/add-ons/kernel/file_systems/udf/DirectoryIterator.cpp
+++ b/src/add-ons/kernel/file_systems/udf/DirectoryIterator.cpp
@@ -61,7 +61,7 @@ DirectoryIterator::GetNextEntry(char *name, uint32 *length, vnode_id *id)
 		} else {
 			CS0String string(entry->id(), entry->id_length());
 			PRINT(("id == `%s'\n", string.String()));
-			PRINT(("vnode_id: %lld\n", to_vnode_id(entry->icb())));
+			PRINT(("vnode_id: %Ld\n", to_vnode_id(entry->icb())));
 			DUMP(entry->icb());
 			sprintf(name, "%s", string.String());
 			*length = string.Length();
diff --git a/src/add-ons/kernel/file_systems/udf/Icb.cpp b/src/add-ons/kernel/file_systems/udf/Icb.cpp
index a4dda56040..33231afa0e 100644
--- a/src/add-ons/kernel/file_systems/udf/Icb.cpp
+++ b/src/add-ons/kernel/file_systems/udf/Icb.cpp
@@ -55,7 +55,7 @@ status_t
 Icb::Read(off_t pos, void *buffer, size_t *length, uint32 *block)
 {
 	DEBUG_INIT_ETC(CF_PUBLIC | CF_HIGH_VOLUME, "Icb",
-	               ("pos: %lld, buffer: %p, length: (%p)->%ld", pos, buffer, length, (length ? *length : 0)));
+	               ("pos: %Ld, buffer: %p, length: (%p)->%ld", pos, buffer, length, (length ? *length : 0)));
 
 	if (!buffer || !length || pos < 0)
 		RETURN(B_BAD_VALUE);		
diff --git a/src/add-ons/kernel/file_systems/udf/Icb.h b/src/add-ons/kernel/file_systems/udf/Icb.h
index e05670deb6..d88f749d1e 100644
--- a/src/add-ons/kernel/file_systems/udf/Icb.h
+++ b/src/add-ons/kernel/file_systems/udf/Icb.h
@@ -128,7 +128,7 @@ template <class DescriptorList>
 status_t
 Icb::_Read(DescriptorList &list, off_t pos, void *_buffer, size_t *length, uint32 *block)
 {
-	DEBUG_INIT_ETC(CF_PRIVATE | CF_HIGH_VOLUME, "Icb", ("list: %p, pos: %lld, buffer: %p, length: (%p)->%ld",
+	DEBUG_INIT_ETC(CF_PRIVATE | CF_HIGH_VOLUME, "Icb", ("list: %p, pos: %Ld, buffer: %p, length: (%p)->%ld",
 	               &list, pos, _buffer, length, (length ? *length : 0))); 
 	if (!_buffer || !length)
 		RETURN(B_BAD_VALUE);
@@ -144,14 +144,14 @@ Icb::_Read(DescriptorList &list, off_t pos, void *_buffer, size_t *length, uint3
 	
 	while (bytesLeft > 0 && !err) {
 		
-		PRINT(("pos: %lld\n", pos));
+		PRINT(("pos: %Ld\n", pos));
 		PRINT(("bytesLeft: %ld\n", bytesLeft));
 		
 		udf_long_address extent;
 		bool isEmpty = false;
 		err = list.FindExtent(pos, &extent, &isEmpty);
 		if (!err) {
-			PRINT(("found extent for offset %lld: (block: %ld, partition: %d, length: %ld, type: %d)\n",
+			PRINT(("found extent for offset %Ld: (block: %ld, partition: %d, length: %ld, type: %d)\n",
 			       pos, extent.block(), extent.partition(), extent.length(), extent.type()));
 			       
 			switch (extent.type()) {
@@ -201,7 +201,7 @@ Icb::_Read(DescriptorList &list, off_t pos, void *_buffer, size_t *length, uint3
 							off_t diskBlock;
 							err = volume->MapBlock(extent, &diskBlock);
 							if (!err) {							
-								PRINT(("reading %ld bytes from disk block %lld using cached_read()\n",
+								PRINT(("reading %ld bytes from disk block %Ld using cached_read()\n",
 								       readLength, diskBlock));
 								err = cached_read(volume->Device(), diskBlock, buffer,
 								                  readLength >> volume->BlockShift(),
@@ -234,7 +234,7 @@ Icb::_Read(DescriptorList &list, off_t pos, void *_buffer, size_t *length, uint3
 							partialLength = bytesLeft;
 					}					
 					
-					PRINT(("partialOffset: %lld\n", partialOffset));
+					PRINT(("partialOffset: %Ld\n", partialOffset));
 					PRINT(("partialLength: %ld\n", partialLength));
 					
 					if (isEmpty) {
@@ -244,7 +244,7 @@ Icb::_Read(DescriptorList &list, off_t pos, void *_buffer, size_t *length, uint3
 						off_t diskBlock;
 						err = volume->MapBlock(extent, &diskBlock);
 						if (!err) {
-							PRINT(("reading %ld bytes from disk block %lld using get_block()\n",
+							PRINT(("reading %ld bytes from disk block %Ld using get_block()\n",
 							       partialLength, diskBlock));
 							uint8 *data = (uint8*)get_block(volume->Device(), diskBlock, volume->BlockSize());
 							err = data ? B_OK : B_BAD_DATA;
@@ -264,7 +264,7 @@ Icb::_Read(DescriptorList &list, off_t pos, void *_buffer, size_t *length, uint3
 				}				 
 			}
 		} else {
-			PRINT(("error finding extent for offset %lld: 0x%lx, `%s'", pos,
+			PRINT(("error finding extent for offset %Ld: 0x%lx, `%s'", pos,
 			       err, strerror(err)));
 			break;
 		}
diff --git a/src/add-ons/kernel/file_systems/udf/Utils.cpp b/src/add-ons/kernel/file_systems/udf/Utils.cpp
index a5f1d517b1..0bd37d7d3e 100644
--- a/src/add-ons/kernel/file_systems/udf/Utils.cpp
+++ b/src/add-ons/kernel/file_systems/udf/Utils.cpp
@@ -26,7 +26,7 @@ namespace Udf {
 udf_long_address
 to_long_address(vnode_id id, uint32 length)
 {
-	DEBUG_INIT_ETC(CF_PUBLIC | CF_HELPER, NULL, ("vnode_id: %lld, length: %ld", id, length));
+	DEBUG_INIT_ETC(CF_PUBLIC | CF_HELPER, NULL, ("vnode_id: %Ld, length: %ld", id, length));
 	udf_long_address result;
 	result.set_block((id >> 16) & 0xffffffff);
 	result.set_partition(id & 0xffff);