diff --git a/diskimage_builder/lib/outfilter.py b/diskimage_builder/lib/outfilter.py
index 728bcf402..71c196d57 100644
--- a/diskimage_builder/lib/outfilter.py
+++ b/diskimage_builder/lib/outfilter.py
@@ -78,7 +78,8 @@ def main():
             if sys.version_info < (3,):
                 outfile.write(ts_line)
             else:
-                outfile.write(ts_line.encode('utf-8'))
+                outfile.write(
+                    ts_line.encode('utf-8', errors='surrogateescape'))
             outfile.flush()