diff --git a/builder.go b/builder.go
index e7f5e330f..19c24c901 100644
--- a/builder.go
+++ b/builder.go
@@ -204,7 +204,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
 			}
 			return err
 		}
-		line = strings.TrimSpace(line)
+		line = strings.Replace(strings.TrimSpace(line), "	", " ", 1)
 		// Skip comments and empty line
 		if len(line) == 0 || line[0] == '#' {
 			continue
@@ -328,7 +328,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
 			fmt.Fprintf(stdout, "===> %s\n", base.ShortId())
 			break
 		default:
-			fmt.Fprintf(stdout, "Skipping unknown op %s\n", tmp[0])
+			fmt.Fprintf(stdout, "Skipping unknown instruction %s\n", strings.ToUpper(instruction))
 		}
 	}
 	if image != nil {