diff --git a/ChangeLog b/ChangeLog
index e1f1298..cd0c448 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-28  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/common/encode.py:
+	  Handle utf-8 properly.
+
 2010-02-28  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/common/program.py:
diff --git a/morituri/common/encode.py b/morituri/common/encode.py
index f380325..1842834 100644
--- a/morituri/common/encode.py
+++ b/morituri/common/encode.py
@@ -129,6 +129,10 @@ class EncodeTask(task.Task):
         @param profile: encoding profile
         @type  profile: L{Profile}
         """
+        assert type(inpath) is unicode, "inpath %r is not unicode" % inpath
+        assert type(outpath) is unicode, \
+            "outpath %r is not unicode" % outpath
+        
         self._inpath = inpath
         self._outpath = outpath
         self._taglist = taglist
@@ -147,8 +151,10 @@ class EncodeTask(task.Task):
             audio/x-raw-int,width=16,depth=16,channels=2 !
             level name=level !
             %s !
-            filesink location="%s" name=sink''' % (self._inpath,
-                self._profile.pipeline, self._outpath))
+            filesink location="%s" name=sink''' % (
+                self._inpath.encode('utf-8'),
+                self._profile.pipeline,
+                self._outpath.encode('utf-8')))
 
         tagger = self._pipeline.get_by_name('tagger')