diff --git a/src/add-ons/kernel/file_systems/udf/Block.h b/src/add-ons/kernel/file_systems/udf/Block.h
deleted file mode 100644
index fbe763be13..0000000000
--- a/src/add-ons/kernel/file_systems/udf/Block.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//----------------------------------------------------------------------
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
-//
-//  Copyright (c) 2003 Tyler Dauwalder, tyler@dauwalder.net
-//---------------------------------------------------------------------
-
-#ifndef _UDF_BLOCK_H
-#define _UDF_BLOCK_H
-
-#include <malloc.h>
-
-#include "cpp.h"
-
-namespace UDF {
-
-template<class DataType>
-class Block {
-public:
-	Block(uint32 blockSize)
-		: fSize(blockSize)
-		, fData(malloc(blockSize))
-	{
-	}
-		
-	~Block() { free(Data()); }	
-	uint32 Size() { return fSize; }	
-	DataType* Data() { return (DataType*)fData; }
-	status_t InitCheck() { return Data() ? B_OK : B_NO_MEMORY; }
-	
-private:
-	Block();
-	Block(const Block&);
-	Block& operator=(const Block&);
-
-	uint32 fSize;
-	void *fData;
-};
-
-};	// namespace UDF
-
-#endif	// _UDF_BLOCK_H
diff --git a/src/add-ons/kernel/file_systems/udf/MemoryChunk.h b/src/add-ons/kernel/file_systems/udf/MemoryChunk.h
new file mode 100644
index 0000000000..dff00e5ebf
--- /dev/null
+++ b/src/add-ons/kernel/file_systems/udf/MemoryChunk.h
@@ -0,0 +1,61 @@
+//----------------------------------------------------------------------
+//  This software is part of the OpenBeOS distribution and is covered 
+//  by the OpenBeOS license.
+//
+//  Copyright (c) 2003 Tyler Dauwalder, tyler@dauwalder.net
+//---------------------------------------------------------------------
+
+#ifndef _UDF_MEMORY_CHUNK_H
+#define _UDF_MEMORY_CHUNK_H
+
+#include <malloc.h>
+
+#include "cpp.h"
+
+namespace UDF {
+
+/*! Simple class to encapsulate the boring details of allocating
+	and deallocating a chunk of memory.
+	
+	The main use for this class is cleanly and simply allocating
+	arbitrary chunks of data on the stack.
+*/
+class MemoryChunk {
+public:
+	MemoryChunk(uint32 blockSize)
+		: fSize(blockSize)
+		, fData(malloc(blockSize))
+		, fOwnsData(true)
+	{
+	}
+	
+	MemoryChunk(uint32 blockSize, void *blockData)
+		: fSize(blockSize)
+		, fData(blockData)
+		, fOwnsData(false)
+	{
+	}
+		
+	~MemoryChunk()
+	{
+		if (fOwnsData)
+			free(Data());
+	}
+	
+	uint32 Size() { return fSize; }	
+	void* Data() { return fData; }
+	status_t InitCheck() { return Data() ? B_OK : B_NO_MEMORY; }
+	
+private:
+	MemoryChunk();
+	MemoryChunk(const MemoryChunk&);
+	MemoryChunk& operator=(const MemoryChunk&);
+
+	uint32 fSize;
+	void *fData;
+	bool fOwnsData;
+};
+
+};	// namespace UDF
+
+#endif	// _UDF_MEMORY_CHUNK_H