diff --git a/doc/changelog.markdown b/doc/changelog.markdown
index f390e510..03314a17 100644
--- a/doc/changelog.markdown
+++ b/doc/changelog.markdown
@@ -5,7 +5,7 @@ Lombok Changelog
 * BUGFIX: Parameterized static methods with `@Builder` would produce compiler errors in javac. [Issue #793](https://code.google.com/p/projectlombok/issues/detail?id=793).
 * PERFORMANCE: the config system caused significant slowdowns in eclipse if the filesystem is very slow (network file system) or has a slow authentication system.
 * FEATURE: the `hashCode()` method generated by lombok via `@EqualsAndHashCode`, `@Data`, and `@Value` is now smarter about nulls; they are treated as if they hash to a magic prime instead of 0, which reduces hash collisions.
-* BUGFIX: Various quickfixes in Eclipse Mars were broken. [Issue #835](https://code.google.com/p/projectlombok/issues/detail?id=835) [Issue #831](https://code.google.com/p/projectlombok/issues/detail?id=831).
+* BUGFIX: Various quickfixes in Eclipse Mars were broken. [Issue #826]([Issue #831](https://code.google.com/p/projectlombok/issues/detail?id=831) [Issue #831](https://code.google.com/p/projectlombok/issues/detail?id=831) [Issue #835](https://code.google.com/p/projectlombok/issues/detail?id=835).
 
 ### v1.16.4 (April 14th, 2015)
 * BUGFIX: Lombok now works with Eclipse Mars.
diff --git a/website/credits.html b/website/credits.html
index 803195bd..de83981e 100644
--- a/website/credits.html
+++ b/website/credits.html
@@ -102,8 +102,7 @@
 				<li>all contributors who submitted patches or helped answering questions!</li>
 				</ul>
 				as well as the authors of the following tools that we use:<ul>
-				<li><a href="https://code.google.com/">Google Code Hosting</a> for hosting our issue tracker as well as the lombok releases.</a></li>
-				<li><a href="https://github.com/">Github</a> for hosting lombok's repository.</li>
+				<li><a href="https://github.com/">Github</a> for hosting lombok's repository and issue tracker.</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
diff --git a/website/download.html b/website/download.html
index d28bcbf0..5e65aaa4 100644
--- a/website/download.html
+++ b/website/download.html
@@ -25,7 +25,7 @@
 				<img src="icon_contribute.png" />
 				<span>Contribute</span>
 			</a>
-			<a class="button" href="https://code.google.com/p/projectlombok/issues/list">
+			<a class="button" href="https://github.com/rzwitserloot/lombok/issues">
 				<img src="icon_bugs.png" />
 				<span>Report an issue</span>
 			</a>
@@ -57,7 +57,7 @@
 				<td class="instruction">Run <code>lombok.jar</code> as a java app (i.e. doubleclick it, usually) to install. Also add lombok.jar to your project. <span style="font-size: 0.8em;"><em>Supported variants: Springsource Tool Suite, JBoss Developer Studio</em></span></td></tr>
 				
 				<tr><td class="platform">IDEA&nbsp;IntelliJ</td>
-				<td class="instruction"><a href="https://code.google.com/p/lombok-intellij-plugin/">A plugin developed by Michael Plushnikov</a> adds support for most features.</td></tr>
+				<td class="instruction"><a href="https://github.com/mplushnikov/lombok-intellij-plugin">A plugin developed by Michael Plushnikov</a> adds support for most features.</td></tr>
 				
 				<tr><td class="platform">Javadoc</td>
 				<td class="instruction">First delombok your code then run javadoc on the result. <a href="features/delombok.html">More&hellip;</a></td></tr>
diff --git a/website/index.html b/website/index.html
index d80a0e7d..b237b6a0 100644
--- a/website/index.html
+++ b/website/index.html
@@ -30,7 +30,7 @@
 				<img src="icon_contribute.png" />
 				<span>Contribute</span>
 			</a>
-			<a class="button" href="https://code.google.com/p/projectlombok/issues/list">
+			<a class="button" href="https://github.com/rzwitserloot/lombok/issues">
 				<img src="icon_bugs.png" />
 				<span>Report an issue</span>
 			</a>
diff --git a/website/setup/android.html b/website/setup/android.html
index 17e821f5..e68ac077 100644
--- a/website/setup/android.html
+++ b/website/setup/android.html
@@ -25,7 +25,7 @@
 				<img src="../icon_contribute.png" />
 				<span>Contribute</span>
 			</a>
-			<a class="button" href="https://code.google.com/p/projectlombok/issues/list">
+			<a class="button" href="https://github.com/rzwitserloot/lombok/issues">
 				<img src="../icon_bugs.png" />
 				<span>Report an issue</span>
 			</a>
diff --git a/website/setup/ecj.html b/website/setup/ecj.html
index 518baa4d..16635fae 100644
--- a/website/setup/ecj.html
+++ b/website/setup/ecj.html
@@ -25,7 +25,7 @@
 				<img src="../icon_contribute.png" />
 				<span>Contribute</span>
 			</a>
-			<a class="button" href="https://code.google.com/p/projectlombok/issues/list">
+			<a class="button" href="https://github.com/rzwitserloot/lombok/issues">
 				<img src="../icon_bugs.png" />
 				<span>Report an issue</span>
 			</a>
diff --git a/website/setup/gwt.html b/website/setup/gwt.html
index ce2a5834..29f6e3bb 100644
--- a/website/setup/gwt.html
+++ b/website/setup/gwt.html
@@ -25,7 +25,7 @@
 				<img src="../icon_contribute.png" />
 				<span>Contribute</span>
 			</a>
-			<a class="button" href="https://code.google.com/p/projectlombok/issues/list">
+			<a class="button" href="https://github.com/rzwitserloot/lombok/issues">
 				<img src="../icon_bugs.png" />
 				<span>Report an issue</span>
 			</a>
diff --git a/website/setup/netbeans.html b/website/setup/netbeans.html
index 96f127f6..ab5ac89c 100644
--- a/website/setup/netbeans.html
+++ b/website/setup/netbeans.html
@@ -25,7 +25,7 @@
 				<img src="../icon_contribute.png" />
 				<span>Contribute</span>
 			</a>
-			<a class="button" href="https://code.google.com/p/projectlombok/issues/list">
+			<a class="button" href="https://github.com/rzwitserloot/lombok/issues">
 				<img src="../icon_bugs.png" />
 				<span>Report an issue</span>
 			</a>