diff --git a/blogthon.cgi b/blogthon.cgi
index 99265c8..79f7ca2 100755
--- a/blogthon.cgi
+++ b/blogthon.cgi
@@ -119,6 +119,7 @@ try:
     permalinks = configuration.get("look", "permalinks")
     comments = configuration.get("look", "comments")
     newest_first = configuration.get("look", "newest_first")
+    tags = configuration.get("look", "tags")
     new_comment_mail = configuration.get("smtp", "new_comment_mail")
     mail_to = configuration.get("smtp", "mail_to")
     smtp_host = configuration.get("smtp", "smtp_host")
@@ -607,10 +608,11 @@ else:
                         print(ind*4 + "<div class=\"entry_date\">%s</div>" % date)
 
                         # Read tags
-                        tags = content.readline().strip()
-                        if re.match(line_start_plus, tags):
-                            tags = tags.replace("+", "")
-                            print(ind*4 + "<div class=\"tags\"><b>Tags:</b> %s</div>" % tags)
+                        tagline = content.readline().strip()
+                        if re.match(line_start_plus, tagline):
+                            tagline = tagline.replace("+", "")
+                            if tags == "True":
+                                print(ind*4 + "<div class=\"tags\"><b>Tags:</b> %s</div>" % tagline)
                         else:
                             content.seek(0)
 
diff --git a/configuration b/configuration
index ed8b2f4..f508d0e 100644
--- a/configuration
+++ b/configuration
@@ -18,6 +18,7 @@ linklist: True
 permalinks: True
 comments: True
 newest_first: True
+tags: True
 
 [smtp]
 new_comment_mail: False