diff --git a/src/Tokenizer.js b/src/Tokenizer.js
index 42064621b4..16fdbc0742 100644
--- a/src/Tokenizer.js
+++ b/src/Tokenizer.js
@@ -739,9 +739,9 @@ export class Tokenizer {
         } while (prevCapZero !== cap[0]);
         text = escape(cap[0]);
         if (cap[1] === 'www.') {
-          href = 'http://' + text;
+          href = 'http://' + cap[0];
         } else {
-          href = text;
+          href = cap[0];
         }
       }
       return {
diff --git a/src/rules.js b/src/rules.js
index 6b29dfd0b0..b53eb347cd 100644
--- a/src/rules.js
+++ b/src/rules.js
@@ -284,7 +284,7 @@ inline.gfm = merge({}, inline.normal, {
   escape: edit(inline.escape).replace('])', '~|])').getRegex(),
   _extended_email: /[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/,
   url: /^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,
-  _backpedal: /(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,
+  _backpedal: /(?:[^?!.,:;*_'"~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_'"~)]+(?!$))+/,
   del: /^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,
   text: /^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\<!\[`*~_]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)))/
 });
diff --git a/test/specs/new/autolinks_quotes.html b/test/specs/new/autolinks_quotes.html
new file mode 100644
index 0000000000..77e8ac9fab
--- /dev/null
+++ b/test/specs/new/autolinks_quotes.html
@@ -0,0 +1,3 @@
+<p>&quot;<a href="https://www.example.com?test=quote-in-%22-url">https://www.example.com?test=quote-in-&quot;-url</a>&quot;</p>
+
+<p>&#39;<a href="https://www.example.com?test=quote-in-'-url">https://www.example.com?test=quote-in-&#39;-url</a>&#39;</p>
diff --git a/test/specs/new/autolinks_quotes.md b/test/specs/new/autolinks_quotes.md
new file mode 100644
index 0000000000..c3fb4d2b7d
--- /dev/null
+++ b/test/specs/new/autolinks_quotes.md
@@ -0,0 +1,3 @@
+"https://www.example.com?test=quote-in-"-url"
+
+'https://www.example.com?test=quote-in-'-url'