diff --git a/stagit-index.c b/stagit-index.c
index 9c31bd7..e765732 100644
--- a/stagit-index.c
+++ b/stagit-index.c
@@ -107,7 +107,7 @@ writeheader(FILE *fp)
 	fprintf(fp, "<table>\n<tr><td><img src=\"%slogo.png\" alt=\"\" width=\"32\" height=\"32\" /></td>\n"
 	        "<td><h1>%s</h1><span class=\"desc\">%s</span></td></tr><tr><td></td><td>\n",
 		relpath, name, description);
-	fputs("</td></tr>\n</table>\n<hr/><div id=\"content\">\n"
+	fputs("</td></tr>\n</table>\n<hr/>\n<div id=\"content\">\n"
 	      "<table id=\"index\"><thead>\n"
 	      "<tr><td>Name</td><td>Description</td><td>Owner</td><td>Last commit</td></tr>"
 	      "</thead><tbody>\n", fp);
diff --git a/stagit.c b/stagit.c
index 5bef865..7cab210 100644
--- a/stagit.c
+++ b/stagit.c
@@ -270,7 +270,7 @@ writeheader(FILE *fp)
 		fprintf(fp, " | <a href=\"%sfile/README.html\">README</a>", relpath);
 	if (haslicense)
 		fprintf(fp, " | <a href=\"%sfile/LICENSE.html\">LICENSE</a>", relpath);
-	fputs("</td></tr></table>\n<hr/><div id=\"content\">\n", fp);
+	fputs("</td></tr></table>\n<hr/>\n<div id=\"content\">\n", fp);
 
 	return 0;
 }
@@ -278,7 +278,7 @@ writeheader(FILE *fp)
 int
 writefooter(FILE *fp)
 {
-	return !fputs("</div></body>\n</html>", fp);
+	return !fputs("</div>\n</body>\n</html>\n", fp);
 }
 
 void