diff --git a/.yapfaqrc.sample b/.yapfaqrc.sample
index 90b25eb..54d63d1 100644
--- a/.yapfaqrc.sample
+++ b/.yapfaqrc.sample
@@ -1,5 +1,4 @@
 # config options
-# - datadir      path to data directory
 # - nntp-server  NNTP server name
 # - nntp-port    NNTP port
 # - nntp-user    user name for AUTHINFO
diff --git a/ChangeLog b/ChangeLog
index 46cc602..3d35539 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,6 @@
 yapfaq 1.0.0 (unreleased)
 * Complete rewrite.
 * Add POD.
-* Fix file handling (UTF8 mode).
 
 yapfaq 0.10 (unreleased)
 * Add: Charset definition.
diff --git a/bin/yapfaq.pl b/bin/yapfaq.pl
index ed8f94d..242e8e4 100755
--- a/bin/yapfaq.pl
+++ b/bin/yapfaq.pl
@@ -372,7 +372,7 @@ sub BuildPosting {
   my($LastPosted, $LastMID);
   if (-r $StatusFile) {
     print "- Reading status ($Project.cfg).\n" if $Config{'debug'};
-    my @Status = path($StatusFile)->lines;
+    my @Status = path($StatusFile)->lines_utf8;
     foreach (@Status) {
       # convert Windows line-endings to Unix
       s/\r//;
@@ -389,8 +389,8 @@ sub BuildPosting {
   }
 
   print "- Reading headers ($Project.hdr) and body ($Project.txt).\n" if $Config{'debug'};
-  my @Headers = path($HeaderFile)->lines;
-  my @Body    = path($BodyFile)->lines;
+  my @Headers = path($HeaderFile)->lines_utf8;
+  my @Body    = path($BodyFile)->lines_utf8;
   my %Header  = &ParseHeaders(@Headers);
 
   # check for mandatory headers
@@ -562,7 +562,7 @@ sub UpdateStatus {
   push @Status, "Last-Message-ID: $LastMID\n";
 
   $StatusFile = path($StatusFile);
-  $StatusFile->spew(@Status);
+  $StatusFile->spew_utf8(@Status);
 
   print "- Status updated.\n" if $Config{'debug'};
   return;