diff --git a/autoblogs/autoblog.php b/autoblogs/autoblog.php
index 87a8b28..16b8063 100644
--- a/autoblogs/autoblog.php
+++ b/autoblogs/autoblog.php
@@ -498,11 +498,11 @@ class VroumVroum_Blog
             $from['path'] = '';
         }
 
-        preg_match_all('!(src|href)\s*=\s*[\'"]?([^"\'<>\s]+\.(?:'.$extensions.'))[\'"]?!i', $content, $match, PREG_SET_ORDER);
+        preg_match_all('!(src|href)\s*=\s*[\'"]?([^"\'<>\s]+\.(?:'.$extensions.')[\'"])[\'"]?!i', $content, $match, PREG_SET_ORDER);
 
         foreach ($match as $m)
         {
-            $url = parse_url($m[2]);
+            $url = parse_url(substr($m[2], 0, -1));
 
             if (empty($url['scheme']))
                 $url['scheme'] = $from['scheme'];