cmd/sgblog/http-entry.tmpl | 7 ++++---
 internal/version.go        | 2 +-

diff --git a/cmd/sgblog/http-entry.tmpl b/cmd/sgblog/http-entry.tmpl
index 031440c24d9f7132c05c0e3c31fe58111fad3e83d3238a78cbc48369fe51088d..2dc99eafb09e5304d1d89d04b53ceb72bb8148409ae0ab0f18ee9b2d8bcf1a2e 100644
--- a/cmd/sgblog/http-entry.tmpl
+++ b/cmd/sgblog/http-entry.tmpl
@@ -32,19 +32,20 @@ {{range .NoteLines}}{{. | lineURLize $.Cfg.URLPrefix}}
 {{end}}</pre>
 <hr/>{{end}}
 
-<ol>{{range $idx, $img := .Imgs}}
+{{if .Imgs}}<ol>{{range $idx, $img := .Imgs}}
 <li><img alt="{{$img.Alt}}" src="//{{$.Cfg.ImgDomain}}/{{$img.Path}}" /></li>
-{{end}}</ol>
+{{end}}</ol>{{end}}
 
 {{if .Cfg.CommentsEmail}}[<a href="mailto:{{.Cfg.CommentsEmail}}?subject={{.TitleEscaped}}">{{$.T.Get "leave a comment"}}</a>]{{end}}
 
+{{if .Comments}}
 <dl>{{range $idx, $comment := .Comments}}
 <dt><a name="comment{{$idx}}"><a href="#comment{{$idx}}">{{$.T.Get "comment"}} {{$idx}}</a>:</dt>
 <dd><pre>
 {{range $comment.HeaderLines}}{{.}}
 {{end}}{{range $comment.BodyLines}}{{. | lineURLize $.Cfg.URLPrefix}}
 {{end}}</pre></dd>
-{{end}}</dl>
+{{end}}</dl>{{end}}
 
 </body>
 </html>
diff --git a/internal/version.go b/internal/version.go
index 72ac34ead7e1bca175b289d5c0c55a0612019e79b9f93e361f2fab05ccd945e9..3e9166743f643e2c54e776a3c58b882c173c879a78209d040c41aec43a9ee74d 100644
--- a/internal/version.go
+++ b/internal/version.go
@@ -1,3 +1,3 @@
 package internal
 
-const Version = "0.39.0"
+const Version = "0.40.0"