diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
index 287e5a31888..5263cfe7b0e 100644
--- a/src/librustdoc/html/layout.rs
+++ b/src/librustdoc/html/layout.rs
@@ -194,10 +194,9 @@ pub fn render<T: fmt::Display, S: fmt::Display>(
                    .collect::<String>(),
     suffix=page.resource_suffix,
     extra_scripts=extra_scripts.iter().map(|e| {
-        format!("<script src=\"{root_path}{extra_script}{suffix}.js\"></script>",
+        format!("<script src=\"{root_path}{extra_script}.js\"></script>",
                 root_path=page.root_path,
-                extra_script=e,
-                suffix=page.resource_suffix)
+                extra_script=e)
     }).collect::<String>(),
     )
 }
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 7b020415af1..ae3f57ab85e 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -1375,7 +1375,8 @@ impl<'a> SourceCollector<'a> {
         layout::render(&mut w, &self.scx.layout,
                        &page, &(""), &Source(contents),
                        self.scx.css_file_extension.is_some(),
-                       &self.scx.themes, &["source-files", "source-script"])?;
+                       &self.scx.themes, &["source-files",
+                                           &format!("source-script{}", page.resource_suffix)])?;
         w.flush()?;
         self.scx.local_sources.insert(p.clone(), href);
         Ok(())