diff --git a/Makefile b/Makefile
index 5c5bdc71..46801cf5 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ all:
 	go get -u github.com/karalabe/xgo
 	rm -rf dist
 	mkdir -p dist
-	xgo --targets="freebsd/amd64,linux/386,linux/amd64,windows/386,windows/amd64,darwin/amd64" -dest ./dist -ldflags="-w -s" ./cmd/jira
+	xgo --go 1.9.0 --targets="freebsd/amd64,linux/386,linux/amd64,windows/386,windows/amd64,darwin/amd64" -dest ./dist -ldflags="-w -s" ./cmd/jira
 
 install:
 	${MAKE} GOBIN=$$HOME/bin build
diff --git a/jiracli/templates.go b/jiracli/templates.go
index 234cd28f..575184a7 100644
--- a/jiracli/templates.go
+++ b/jiracli/templates.go
@@ -474,7 +474,8 @@ fields:
     - name: {{ .name }}{{end}}{{end}}
 {{- end -}}
 {{if .meta.fields.description}}
-  description: {{or .overrides.description .fields.description }}
+  description: |~
+    {{ or .fields.description "" | indent 4 }}
 {{- end -}}
 {{if .meta.fields.fixVersions -}}
   {{if .meta.fields.fixVersions.allowedValues}}