diff --git a/Makefile b/Makefile
index bb08c6686..e703623c3 100644
--- a/Makefile
+++ b/Makefile
@@ -353,10 +353,9 @@ $(web_dest)/: $(MAIN) html
 		cp $(web_src)/*.css $(web_dest)/; \
 		sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome | \
 			$(make_page) > $(web_dest)/osx-notes.html; \
-		sed -e '/^ --.*/d' changelog | \
-			sed -e 's#^#    #g' | \
+		sed -e '/^ --.*/d' -e 's#^#    #g' changelog | \
 			sed -e 's/    \(pandoc (.*\)/## \1/g' | \
-			$(make_page) > $(web_dest)/history.html; \
+			$(make_page) -T "Pandoc changelog" > $(web_dest)/changelog.html; \
 		$(make_page) README > $(web_dest)/README.html; \
 		$(make_page) INSTALL > $(web_dest)/INSTALL.html; \
 		sed -e 's/@TARBALL_NAME@/$(tarball_name)/g' $(web_src)/index.txt | \
@@ -371,7 +370,7 @@ $(web_dest)/: $(MAIN) html
 		cp $(web_src)/header.html $(web_dest)/ ; \
 		cp $(web_src)/footer.html $(web_dest)/ ; \
 		sh $(web_src)/mkdemos.sh $(web_dest) $(abspath .) | \
-		    $(make_page) > $(web_dest)/demos.html; \
+		    $(make_page) > $(web_dest)/examples.html; \
 	) || { rm -rf $(web_dest); exit 1; }
 
 .PHONY: distclean clean
diff --git a/web/header.html b/web/header.html
index ee5528c94..4a5f60901 100644
--- a/web/header.html
+++ b/web/header.html
@@ -1,14 +1,10 @@
-<div id="header">
-<h1><a href="index.html">Pandoc</a></h1>
-</div>
-
 <div id="sidebar">
 <ul>
 <li><a href="index.html" title="Home page">Home</a></li>
 <li><a href="README.html" title="Pandoc documentation">README</a></li>
-<li><a href="demos.html" title="Pandoc demos">Demos</a></li>
+<li><a href="examples.html" title="Pandoc demos">Examples</a></li>
 <li><a href="doc/index.html" title="API documentation for Pandoc libraries">API</a></li>
-<li><a href="history.html" title="Pandoc's changelog">History</a></li>
+<li><a href="changelog.html" title="Pandoc's changelog">History</a></li>
 </ul>
 </div>
 <div id="main" class="withleftmenu">
diff --git a/web/main.css b/web/main.css
index b545811ec..b41ad6483 100644
--- a/web/main.css
+++ b/web/main.css
@@ -117,7 +117,7 @@ dt {
     color:#336666;
     padding-left:2em;
     margin-bottom:0;
-    width: 6em;
+    width: 7em;
 }
 #sidebar li {
     font-family: verdana;
@@ -146,7 +146,7 @@ dt {
     border-left: 1px solid gray;
 }
 #main.withleftmenu {
-    margin-left: 8em;
+    margin-left: 9em;
 }
 
 div.clear { clear: both; 
diff --git a/web/mkdemos.sh b/web/mkdemos.sh
index f612ffc35..ac3d45106 100644
--- a/web/mkdemos.sh
+++ b/web/mkdemos.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-# creates demo page for pandoc
+# creates example page for pandoc
 # argument #1 is the destination directory
 # argument #2 is the directory containing pandoc, html2markdown, markdown2pdf
 
@@ -8,27 +8,27 @@ PROGPATH=$2
 
 NEWLINE='
 '
-DEMOS='pandoc README -o demo0.html
-pandoc -s -S README -o demo0.html
-pandoc -s -S -c main.css -B header.html -A footer.html README -o demo0.html
-pandoc -s README -o demo0.tex
-pandoc -s README.tex -o demo0.txt
-pandoc -s -w rst README -o demo0.txt
-pandoc -s README -o demo0.rtf 
-pandoc -s -m -i -w s5 S5DEMO -o demo0.html
-html2markdown http://www.gnu.org/software/make/ -o demo0.txt
-markdown2pdf README -o demo0.pdf
-markdown2pdf -C myheader.tex README -o demo0.pdf'
+EXAMPLES='pandoc README -o example0.html
+pandoc -s -S README -o example0.html
+pandoc -s -S -c main.css -B header.html -A footer.html README -o example0.html
+pandoc -s README -o example0.tex
+pandoc -s README.tex -o example0.txt
+pandoc -s -w rst README -o example0.txt
+pandoc -s README -o example0.rtf 
+pandoc -s -m -i -w s5 S5DEMO -o example0.html
+html2markdown http://www.gnu.org/software/make/ -o example0.txt
+markdown2pdf README -o example0.pdf
+markdown2pdf -C myheader.tex README -o example0.pdf'
 
 oldifs=$IFS
 IFS=$NEWLINE
-set -- $DEMOS
+set -- $EXAMPLES
 IFS=$oldifs
 
 cd $DEST
 PATH=$PROGPATH:$PATH
 
-echo '% Pandoc demos
+echo '% Pandoc examples
 
 To see the output created by each of the commands below,
 click on the name of the output file: