diff --git a/content/hints.js b/content/hints.js
index 6af6a559..fee05886 100644
--- a/content/hints.js
+++ b/content/hints.js
@@ -353,7 +353,7 @@ vimperator.Hints = function () //{{{
             case "V": vimperator.commands.viewsource(loc, true); break;
             case "w": vimperator.buffer.followLink(elem, vimperator.NEW_WINDOW);  break;
             case "W": vimperator.commandline.open(":", "winopen " + loc, vimperator.modes.EX); break;
-            case "y": setTimeout(function(){vimperator.copyToClipboard(vimperator.buffer.URL, true)}, timeout + 50); break;
+            case "y": setTimeout(function(){vimperator.copyToClipboard(loc, true)}, timeout + 50); break;
             case "Y": setTimeout(function(){vimperator.copyToClipboard(elem.textContent || "", true)}, timeout + 50); break;
             default:
                 vimperator.echoerr("INTERNAL ERROR: unknown submode: " + submode);
diff --git a/content/mappings.js b/content/mappings.js
index 3618e65c..030b3ad6 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -1274,7 +1274,7 @@ vimperator.Mappings = function () //{{{
                   "<li><code class=\"mapping\">v</code> to view its destination source</li>" +
                   "<li><code class=\"mapping\">w</code> to open its destination in a new window</li>" +
                   "<li><code class=\"mapping\">W</code> to open its location in a <code class=\"command\">:winopen</code> query</li>" +
-                  "<li><code class=\"mapping\">y</code> to yank its location</li>" +
+                  "<li><code class=\"mapping\">y</code> to yank its destination location</li>" +
                   "<li><code class=\"mapping\">Y</code> to yank its text description</li>" +
                   "</ul>" +
                   "Additionally there are two <code class='argument'>{mode}</code>s, which will start an AlwaysHint mode:<br/>" +