diff --git a/website/credits.html b/website/credits.html
new file mode 100644
index 00000000..f480e47e
--- /dev/null
+++ b/website/credits.html
@@ -0,0 +1,72 @@
+<!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 - Credits</title>
+	<style type="text/css">
+		h1 {
+			font-size: 14px;
+			text-align: center;
+			width: 100%;
+		}
+		
+		.meat {
+			margin: 16px auto 0 auto;
+			width: 800px;
+		}
+		
+		.reinierImg {
+			float: left;
+			margin-right: 16px;
+		}
+		
+		.roelImg {
+			margin-left: 16px;
+			float: right;
+		}
+		
+		.thanks {
+			clear: both;
+			padding-top: 32px;
+		}
+		
+		.back {
+			margin-top: 32px;
+		}
+		
+		ul {
+			list-style-image: url(lombokBullet.png);
+			list-style-position: inside;
+		}
+	</style>
+</head><body>
+	<div class="meat">
+		<h1>Project Lombok - About the authors and everyone that's helped us create Project Lombok.</h1>
+		<div class="credits">
+			<div class="aboutUs">
+				<img class="reinierImg" src="file:///Users/rzwitserloot/Pictures/me/Reinier%20Zwitserloot%20small.jpg" style="float: left;" />
+				<img class="roelImg" src="file:///Users/rzwitserloot/Pictures/me/Reinier%20Zwitserloot%20small.jpg" style="float: right;" />
+				<p>
+				Project Lombok is created by us: Reinier Zwitserloot (on the left) and Roel Spilker (on the right).
+				</p>
+			</div>
+			<div class="thanks">
+				We'd like to thank:<ul>
+				<li>Perry Nguyen (pfn on ##java on freenode) for creating the inspiration for project lombok.</li>
+				<li><a href="http://code.google.com/">Google Code Hosting</a> for hosting our issue tracker as well as the lombok releases.</a></li>
+				<li><a href="http://github.com/">Github</a> for hosting lombok's repository and website.</li>
+				<li>The <a href="http://asm.ow2.org/index.html">ASM team</a> at ObjectWeb for creating an excellent class file editing tool.
+					Lombok uses ASM to interact with Eclipse.</li>
+				<li>Markus Gebhard for creating <a href="http://java2html.de/">java2html</a> which we use for the example code snippets on the
+					features pages.</li>
+				<li>Tor Norbye for some feedback on how Netbeans works internally. We haven't cracked the netbeans nut quite yet, and help is
+					very welcome. Still, we've made some progress in adding netbeans support to Project Lombok thanks to Tor.</li>
+				<li><a href="http://javaposse.com/">The Java Posse</a> for making the java community <em>awesome</em>. Listen to their podcast!</li>
+				</ul>
+			</div>
+		</div>
+		<div class="back"><a href="index.html">Back to the home page</a>.
+	</div>
+</body></html>
diff --git a/website/features/Cleanup.html b/website/features/Cleanup.html
index 098f111c..ee8542e1 100644
--- a/website/features/Cleanup.html
+++ b/website/features/Cleanup.html
@@ -55,7 +55,7 @@
 		</div>
 		<div class="footer">
 			<a href="index.html">Back to features</a> | <a href="Data.html">Previous feature (@Data)</a> | <a href="Synchronized.html">Next feature (@Synchronized)</a><br />
-			<span class="copyright">Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.</span>
+			<a href="../credits.html" class="creditsLink">credits</a> | <span class="copyright">Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.</span>
 		</div>
 		<div style="clear: both;"></div>
 	</div>
diff --git a/website/features/Data.html b/website/features/Data.html
index b02bdd0e..71634ef2 100644
--- a/website/features/Data.html
+++ b/website/features/Data.html
@@ -74,7 +74,7 @@
 		</div>
 		<div class="footer">
 			<a href="index.html">Back to features</a> | <a href="GetterSetter.html">Previous feature (@Getter / @Setter)</a> | <a href="Cleanup.html">Next feature (@Cleanup)</a><br />
-			<span class="copyright">Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.</span>
+			<a href="../credits.html" class="creditsLink">credits</a> | <span class="copyright">Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.</span>
 		</div>
 		<div style="clear: both;"></div>
 	</div>
diff --git a/website/features/GetterSetter.html b/website/features/GetterSetter.html
index 9ca8ac19..b96af8a6 100644
--- a/website/features/GetterSetter.html
+++ b/website/features/GetterSetter.html
@@ -53,7 +53,7 @@
 		</div>
 		<div class="footer">
 			<a href="index.html">Back to features</a> | <span class="disabled">Previous feature</span> | <a href="Data.html">Next feature (@Data)</a><br />
-			<span class="copyright">Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.</span>
+			<a href="../credits.html" class="creditsLink">credits</a> | <span class="copyright">Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.</span>
 		</div>
 		<div style="clear: both;"></div>
 	</div>
diff --git a/website/features/SneakyThrows.html b/website/features/SneakyThrows.html
index 14319cde..1e98cc53 100644
--- a/website/features/SneakyThrows.html
+++ b/website/features/SneakyThrows.html
@@ -70,7 +70,7 @@
 		</div>
 		<div class="footer">
 			<a href="index.html">Back to features</a> | <a href="Synchronized.html">Previous feature (@Synchronized)</a> | <span class="disabled">Next feature</span><br />
-			<span class="copyright">Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.</span>
+			<a href="../credits.html" class="creditsLink">credits</a> | <span class="copyright">Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.</span>
 		</div>
 		<div style="clear: both;"></div>
 	</div>
diff --git a/website/features/Synchronized.html b/website/features/Synchronized.html
index 99cf4501..c7994de0 100644
--- a/website/features/Synchronized.html
+++ b/website/features/Synchronized.html
@@ -55,7 +55,7 @@
 		</div>
 		<div class="footer">
 			<a href="index.html">Back to features</a> | <a href="Cleanup.html">Previous feature (@Cleanup)</a> | <a href="SneakyThrows.html">Next feature (@SneakyThrows)</a><br />
-			<span class="copyright">Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.</span>
+			<a href="../credits.html" class="creditsLink">credits</a> | <span class="copyright">Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.</span>
 		</div>
 		<div style="clear: both;"></div>
 	</div>
diff --git a/website/features/features.css b/website/features/features.css
index d726f679..5de41654 100644
--- a/website/features/features.css
+++ b/website/features/features.css
@@ -133,3 +133,8 @@ h1 {
 	font-size: 11px;
 	font-style: italic;
 }
+
+.creditsLink {
+	font-style: normal;
+	font-weight: bold;
+}
diff --git a/website/features/index.html b/website/features/index.html
index 5c318e78..a929dd26 100644
--- a/website/features/index.html
+++ b/website/features/index.html
@@ -27,7 +27,7 @@
 			</dl>
 		</div>
 		<div class="footer">
-			<span class="copyright">Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.</span>
+			<a href="../credits.html" class="creditsLink">credits</a> | <span class="copyright">Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.</span>
 		</div>
 		<div style="clear: both;"></div>
 	</div>
diff --git a/website/index.css b/website/index.css
index bc3f9e3c..e2884250 100644
--- a/website/index.css
+++ b/website/index.css
@@ -134,3 +134,8 @@ code {
 	width: 100%;
 	text-align: center;
 }
+
+.creditsLink {
+	font-style: normal;
+	font-weight: bold;
+}
diff --git a/website/index.html b/website/index.html
index dec0c7b5..db06400f 100644
--- a/website/index.html
+++ b/website/index.html
@@ -49,7 +49,7 @@
 			<a href="slideshow.html">I don't want to see a video - show me a slideshow instead!</a>
 		</div>
 		<div class="footer">
-			Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.
+			<a href="credits.html" class="creditsLink">credits</a> | Copyright &copy; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href="http://www.opensource.org/licenses/mit-license.php">MIT licence</a>.
 		</div>
 	</div>
 </body></html>
diff --git a/website/lombokBullet.png b/website/lombokBullet.png
new file mode 100644
index 00000000..b19beee2
Binary files /dev/null and b/website/lombokBullet.png differ