diff --git a/headers/os/codec/MediaWriter.h b/headers/os/codec/MediaWriter.h
index 7fea170240..2b7e5ad7fb 100644
--- a/headers/os/codec/MediaWriter.h
+++ b/headers/os/codec/MediaWriter.h
@@ -5,6 +5,7 @@
 #ifndef _MEDIA_WRITER_H
 #define _MEDIA_WRITER_H
 
+#include <MetaData.h>
 
 #include "EncoderPlugin.h"
 #include "TList.h"
@@ -31,9 +32,12 @@ public:
 									const media_codec_info* codecInfo,
 									media_format* format, uint32 flags = 0);
 
-			status_t			SetCopyright(int32 streamIndex,
-									const char* copyright);
-			status_t			SetCopyright(const char* copyright);
+			// TODO: One of those is probably misplaced here.
+			// TODO: Why pointers? Just copy it
+			status_t			SetMetaData(BMetaData* data);
+			status_t			SetMetaData(int32 streamIndex,
+									BMetaData* data);
+
 			status_t			CommitHeader();
 			status_t			Flush();
 			status_t			Close();
diff --git a/headers/os/codec/WriterPlugin.h b/headers/os/codec/WriterPlugin.h
index 3b8457a433..5c3ff82df7 100644
--- a/headers/os/codec/WriterPlugin.h
+++ b/headers/os/codec/WriterPlugin.h
@@ -1,6 +1,7 @@
 #ifndef _WRITER_PLUGIN_H
 #define _WRITER_PLUGIN_H
 
+#include <MetaData.h>
 #include <MediaTrack.h>
 
 #include "MediaPlugin.h"
@@ -16,7 +17,7 @@ public:
 
 	virtual	status_t			Init(const media_file_format* fileFormat) = 0;
 
-	virtual	status_t			SetCopyright(const char* copyright) = 0;
+	virtual	status_t			SetMetaData(BMetaData* data) = 0;
 	virtual	status_t			CommitHeader() = 0;
 	virtual	status_t			Flush() = 0;
 	virtual	status_t			Close() = 0;
@@ -26,8 +27,8 @@ public:
 									const media_codec_info* codecInfo) = 0;
 	virtual	status_t			FreeCookie(void* cookie) = 0;
 
-	virtual	status_t			SetCopyright(void* cookie,
-									const char* copyright) = 0;
+	virtual status_t			SetMetaData(void* cookie,
+									BMetaData* data) = 0;
 
 	virtual	status_t			AddTrackInfo(void* cookie, uint32 code,
 									const void* data, size_t size,
diff --git a/src/kits/codec/MediaWriter.cpp b/src/kits/codec/MediaWriter.cpp
index 4329d1b0f6..4aa4160a01 100644
--- a/src/kits/codec/MediaWriter.cpp
+++ b/src/kits/codec/MediaWriter.cpp
@@ -152,17 +152,17 @@ MediaWriter::CreateEncoder(Encoder** _encoder,
 
 
 status_t
-MediaWriter::SetCopyright(const char* copyright)
+MediaWriter::SetMetaData(BMetaData* data)
 {
 	if (fWriter == NULL)
 		return B_NO_INIT;
 
-	return fWriter->SetCopyright(copyright);
+	return fWriter->SetMetaData(data);
 }
 
 
 status_t
-MediaWriter::SetCopyright(int32 streamIndex, const char* copyright)
+MediaWriter::SetMetaData(int32 streamIndex, BMetaData* data)
 {
 	if (fWriter == NULL)
 		return B_NO_INIT;
@@ -171,7 +171,7 @@ MediaWriter::SetCopyright(int32 streamIndex, const char* copyright)
 	if (!fStreamInfos.Get(streamIndex, &info))
 		return B_BAD_INDEX;
 
-	return fWriter->SetCopyright(info->cookie, copyright);
+	return fWriter->SetMetaData(info->cookie, data);
 }