diff --git a/main.go b/main.go
index e23b2d4..dc3d759 100644
--- a/main.go
+++ b/main.go
@@ -937,8 +937,16 @@ func renderLinks(pageText string, edit bool) string {
 		s = strings.TrimSuffix(s, "]]")
 		s = strings.TrimSpace(s)
 		if tag {
+            switch s {
+            case "TODO":
+                return fmt.Sprint(`[ ] `)
+            case "DONE":
+                return fmt.Sprint(`[X] `)
+            default:
 			return fmt.Sprintf(`<a href=%q class="tag">%s</a>`, cleanNameURL(s), s)
+            }
 		}
+
 		editPart := ""
 		if edit {
 			editPart = "edit/"