diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php
index 3e4bc3f4732..74049b6ce2a 100644
--- a/lib/outputrequirementslib.php
+++ b/lib/outputrequirementslib.php
@@ -1225,8 +1225,13 @@ class page_requirements_manager {
             $format = '-debug';
         }
 
+        $rollupversion = $CFG->yui3version;
+        if (!empty($CFG->yuipatchlevel)) {
+            $rollupversion .= '_' . $CFG->yuipatchlevel;
+        }
+
         $baserollups = array(
-            'rollup/' . $CFG->yui3version . "/yui-moodlesimple{$yuiformat}.js",
+            'rollup/' . $rollupversion . "/yui-moodlesimple{$yuiformat}.js",
             'rollup/' . $jsrev . "/mcore{$format}.js",
         );
 
diff --git a/theme/yui_combo.php b/theme/yui_combo.php
index 83221392363..77f7c7ed199 100644
--- a/theme/yui_combo.php
+++ b/theme/yui_combo.php
@@ -83,7 +83,8 @@ while (count($parts)) {
 
     $version = array_shift($bits);
     if ($version === 'rollup') {
-        $revision = array_shift($bits);
+        $yuipatchedversion = explode('_', array_shift($bits));
+        $revision = $yuipatchedversion[0];
         $rollupname = array_shift($bits);
 
         if (strpos($rollupname, 'yui-moodlesimple') !== false) {