diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 41b9265c6..f0c8d54b4 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -528,6 +528,7 @@ sub _concatenate_css {
     }
 
     $file =~ s/^\Q$cgi_path\E\///o;
+    $file =~ s#^.*(?=/assets)#data#;
     return mtime_filter($file);
 }
 
@@ -588,6 +589,7 @@ sub _concatenate_js {
     }
 
     $file =~ s/^\Q$cgi_path\E\///o;
+    $file =~ s#^.*(?=/assets)#data#;
     return [ $file ];
 }
 
diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi
index 7b2d2f55d..57c9e4418 100755
--- a/showdependencygraph.cgi
+++ b/showdependencygraph.cgi
@@ -283,6 +283,7 @@ if ($webdotbase =~ /^https?:/) {
     # need to make that into a relative path.
     my $cgi_root = bz_locations()->{cgi_path};
     $pngfilename =~ s#^\Q$cgi_root\E/?##;
+    $pngfilename =~ s#^.*(?=webdot)##;
     
     $vars->{'image_url'} = $pngfilename;