diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98b9aacc92..1523c0927b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,4 @@
-# Changelog for [unreleased] (UNRELEASED)
-
-The following sections list the changes in ocis-konnectd unreleased.
+# Changes in unreleased
 
 ## Summary
 
diff --git a/Makefile b/Makefile
index b9393fb4c5..896c33769e 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ sync:
 .PHONY: clean
 clean:
 	go clean -i ./...
-	rm -rf $(BIN) $(DIST)
+	rm -rf $(BIN) $(DIST) $(HUGO)
 
 .PHONY: fmt
 fmt:
diff --git a/changelog/CHANGELOG.tmpl b/changelog/CHANGELOG.tmpl
index 90ca14e4cf..b76a13c4f4 100644
--- a/changelog/CHANGELOG.tmpl
+++ b/changelog/CHANGELOG.tmpl
@@ -1,10 +1,10 @@
 {{ $allVersions := . }}
 {{- range $index, $changes := . }}{{ with $changes -}}
+{{ if gt (len $allVersions) 1 -}}
 # Changelog for [{{ .Version }}] ({{ .Date }})
 
 The following sections list the changes in ocis-konnectd {{ .Version }}.
 
-{{ if gt (len $allVersions) 1 -}}
 {{/* creating version compare links */ -}}
 {{ $next := add1 $index -}}
 {{ if ne (len $allVersions) $next -}}
@@ -23,7 +23,10 @@ The following sections list the changes in ocis-konnectd {{ .Version }}.
 [{{ .Version }}]: https://github.com/owncloud/ocis-konnectd/compare/66337bb4dad4a3202880323adf7a51a1a3bb4085...v{{ .Version }}
 
 {{ end -}}
-{{- end -}}
+{{ else -}}
+# Changes in {{ .Version }}
+
+{{ end -}}
 
 ## Summary
 {{ range $entry := .Entries }}{{ with $entry }}