diff --git a/Board/Yotsuba.pm b/Board/Yotsuba.pm
index ff047a9..58c8b62 100644
--- a/Board/Yotsuba.pm
+++ b/Board/Yotsuba.pm
@@ -75,7 +75,7 @@ sub new_yotsuba_post($$$$$$$$$$$$){
 	
 	# Extract extra info we need from media links
 	if($link){
-		(my $number, $type)=$link=~m!/src/(\d+)\.(\w+)!;
+		(my $number, $type)=$link=~m!/(\d+)\.(\w+)!;
 		$orig_filename //= "$number.$type";
 		$media = ($filename or "$number.$type");
 		$preview = "${number}s.jpg";
@@ -177,7 +177,7 @@ sub parse_post($$$){
 
 	($spoilerfn, $link, $spoiler, $filesize, $width, $height, $filename, $md5, $theight, $twidth) = 
 		($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) if
-		$post=~m!<div \s class="fileText" \s id="[^"]*"(?: \s* title="([^"]*)")?>File: \s <a \s href="([^"]*)"[^<]*</a>-\((Spoiler \s Image,)? \s* ([\d\sGMKB\.]+),
+		$post=~m!<div \s class="fileText" \s id="[^"]*"(?: \s* title="([^"]*)")?>File: \s <a \s href="([^"]*)"[^<]*</a>\s\((Spoiler \s Image,)? \s* ([\d\sGMKB\.]+),
 				\s* (\d+)x(\d+) (?:, \s* <span>([^<]*)</span>)?.*? 
 				<img \s src="[^"]*" .*? data-md5="([^"]*)" \s style="height: \s 
 				([0-9]*)px; \s width: \s ([0-9]*)px;"!xs;