diff --git a/util/dockerfileparse.py b/util/dockerfileparse.py
index f8e8631f8..4dde4b0e6 100644
--- a/util/dockerfileparse.py
+++ b/util/dockerfileparse.py
@@ -79,8 +79,8 @@ def parse_dockerfile(contents):
   for line in lines:
     match_command = COMMAND_REGEX.match(line)
     if match_command:
-      command = match_command.group(1).upper()
-      parameters = match_command.group(2)
+      command = match_command.group(1).decode('utf-8').upper()
+      parameters = match_command.group(2).decode('utf-8')
 
       commands.append({
         'command': command,
@@ -91,5 +91,6 @@ def parse_dockerfile(contents):
 
 
 def serialize_dockerfile(parsed_dockerfile):
-  return '\n'.join([' '.join([command['command'], command['parameters']])
+  return '\n'.join([' '.join([command['command'].encode('utf-8'),
+                              command['parameters'].encode('utf-8')])
                     for command in parsed_dockerfile.commands])