diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index 13a8ff18..3af84f45 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -263,7 +263,7 @@ such as converting the changelog into HTML, and creating javadoc.
 	<target name="changelogToHtml" depends="-compile-webclasses">
 		<mkdir dir="build/website" />
 		<property name="CHANGELOG_FILE" location="doc/changelog.markdown" />
-		<property name="CHANGELOG_HTML" location="build/website/changelog.html" />
+		<property name="CHANGELOG_HTML" location="build/website/changelog-raw.html" />
 		<java fork="true" classname="lombok.website.CompileChangelog" failonerror="true">
 			<classpath>
 				<path refid="buildScripts.deps.path" />
@@ -272,6 +272,18 @@ such as converting the changelog into HTML, and creating javadoc.
 			<arg value="${CHANGELOG_FILE}" />
 			<arg value="${CHANGELOG_HTML}" />
 		</java>
+		<loadfile property="changelog.main" srcFile="build/website/changelog-raw.html" />
+		<delete file="build/website/changelog-raw.html" />
+		<copy todir="build/website" overwrite="true">
+			<fileset dir="website">
+				<include name="changelog.html" />
+			</fileset>
+			<filterchain>
+				<replacetokens>
+					<token key="CHANGELOG" value="${changelog.main}" />
+				</replacetokens>
+			</filterchain>
+		</copy>
 	</target>
 	
 	<target name="javadoc" description="Generates the javadoc" depends="version">
diff --git a/website/changelog.html b/website/changelog.html
new file mode 100644
index 00000000..df09e661
--- /dev/null
+++ b/website/changelog.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html><head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<link rel="stylesheet" type="text/css" href="logi/reset.css" />
+	<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
+	<meta name="description" content="Spice up your java" />
+	<title>Project Lombok - Changelog</title>
+	<style type="text/css">
+		body {
+			margin: 8px;
+		}
+	</style>
+</head><body>
+	@CHANGELOG@
+</body></html>