diff --git a/content/netError.xhtml b/content/netError.xhtml
index d001734..b468458 100644
--- a/content/netError.xhtml
+++ b/content/netError.xhtml
@@ -35,6 +35,10 @@
         value='archive' label=' &resurrect.archive;'
         image='chrome://resurrect/skin/cacheicons/archive.png'
       />
+      <xul:button
+        value='waybackmachine' label=' &resurrect.waybackmachine;'
+        image='chrome://resurrect/skin/cacheicons/waybackmachine.png'
+      />
       <xul:button
         value='bing' label=' &resurrect.bing;'
         image='chrome://resurrect/skin/cacheicons/bing.png'
diff --git a/content/resurrect-select-mirror.xul b/content/resurrect-select-mirror.xul
index 520ed24..ffa4f42 100644
--- a/content/resurrect-select-mirror.xul
+++ b/content/resurrect-select-mirror.xul
@@ -52,6 +52,10 @@ window.addEventListener('load', resurrect.loadTarget, false);
 			value='archive' label=' &resurrect.archive;'
 			image='chrome://resurrect/skin/cacheicons/archive.png'
 		/>
+		<xul:button
+			value='waybackmachine' label=' &resurrect.waybackmachine;'
+			image='chrome://resurrect/skin/cacheicons/waybackmachine.png'
+		/>
 		<xul:button
 			value='bing' label=' &resurrect.bing;'
 			image='chrome://resurrect/skin/cacheicons/bing.png'
diff --git a/content/resurrect.js b/content/resurrect.js
index 4260822..a04e2bc 100644
--- a/content/resurrect.js
+++ b/content/resurrect.js
@@ -175,6 +175,9 @@ var resurrect={
 		case 'archive':
 			gotoUrl='http://web.archive.org/web/*/'+rawUrl;
 			break;
+		case 'waybackmachine':
+			gotoUrl='http://waybackmachine.org/*/'+rawUrl;
+			break;
 		case 'yahoo':
 			var xhr=new XMLHttpRequest();
 			xhr.open('GET',
diff --git a/install.rdf b/install.rdf
index 8d3d3df..ab4f11f 100644
--- a/install.rdf
+++ b/install.rdf
@@ -3,7 +3,7 @@
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>{0c8fbd76-bdeb-4c52-9b24-d587ce7b9dc3}</em:id>
 		<em:name>Resurrect Pages</em:name>
-		<em:version>2.0.6</em:version>
+		<em:version>2.0.7</em:version>
 		<em:description>Resurrect dead pages, by finding their ghosts.</em:description>
 
 		<em:homepageURL>http://trac.arantius.com/wiki/Extensions/Resurrect</em:homepageURL>
diff --git a/locale/en-US/overlay.dtd b/locale/en-US/overlay.dtd
index ace6d2e..725d687 100644
--- a/locale/en-US/overlay.dtd
+++ b/locale/en-US/overlay.dtd
@@ -9,6 +9,7 @@
 <!ENTITY resurrect.textonly " (text only)">
 <!ENTITY resurrect.yahoo "Yahoo!">
 <!ENTITY resurrect.archive "The Internet Archive">
+<!ENTITY resurrect.waybackmachine "The Wayback Machine">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
 <!ENTITY resurrect.webcitation "WebCite">
diff --git a/skin/cacheicons/waybackmachine.png b/skin/cacheicons/waybackmachine.png
new file mode 100644
index 0000000..6c8b48e
Binary files /dev/null and b/skin/cacheicons/waybackmachine.png differ