diff --git a/godoc/godoc.go b/godoc/godoc.go
index dda1f49c..b2bd42e3 100644
--- a/godoc/godoc.go
+++ b/godoc/godoc.go
@@ -491,8 +491,8 @@ func (p *Presentation) example_htmlFunc(info *PageInfo, funcName string) string
 
 		err := p.ExampleHTML.Execute(&buf, struct {
 			Name, Doc, Code, Play, Output string
-			Share                         bool
-		}{eg.Name, eg.Doc, code, play, out, info.Share})
+			Share, Unordered              bool
+		}{eg.Name, eg.Doc, code, play, out, info.Share, eg.Unordered})
 		if err != nil {
 			log.Print(err)
 		}
@@ -587,7 +587,7 @@ func startsWithUppercase(s string) bool {
 	return unicode.IsUpper(r)
 }
 
-var exampleOutputRx = regexp.MustCompile(`(?i)//[[:space:]]*output:`)
+var exampleOutputRx = regexp.MustCompile(`(?i)//([[:space:]]*unordered)?[[:space:]]*output:`)
 
 // stripExampleSuffix strips lowercase braz in Foo_braz or Foo_Bar_braz from name
 // while keeping uppercase Braz in Foo_Braz.
diff --git a/godoc/static/example.html b/godoc/static/example.html
index 3bc0eb9b..aacf4f7e 100644
--- a/godoc/static/example.html
+++ b/godoc/static/example.html
@@ -22,7 +22,11 @@
 			<p>Code:</p>
 			<pre class="code">{{.Code}}</pre>
 			{{with .Output}}
+			{{if $.Unordered}}
+			<p>Unordered Output:</p>
+			{{else}}
 			<p>Output:</p>
+			{{end}}
 			<pre class="output">{{html .}}</pre>
 			{{end}}
 		{{end}}
diff --git a/godoc/static/static.go b/godoc/static/static.go
index 985243d8..774c7383 100644
--- a/godoc/static/static.go
+++ b/godoc/static/static.go
@@ -450,7 +450,11 @@ var Files = map[string]string{
 			<p>Code:</p>
 			<pre class="code">{{.Code}}</pre>
 			{{with .Output}}
+			{{if $.Unordered}}
+			<p>Unordered Output:</p>
+			{{else}}
 			<p>Output:</p>
+			{{end}}
 			<pre class="output">{{html .}}</pre>
 			{{end}}
 		{{end}}