diff --git a/CHANGELOG b/CHANGELOG
index e7db71b08492d04c60d0abaea1f7c697e457a0d7..1148ad10dcaeb9a6775404cc9ddfa5db3ae9a9e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.12.0 (unreleased)
+  - Update the rouge gem to 2.0.6, which adds highlighting support for JSX, Prometheus, and others. !6251
   - Add ability to fork to a specific namespace using API. (ritave)
   - Cleanup misalignments in Issue list view !6206
   - Prepend blank line to `Closes` message on merge request linked to issue (lukehowell)
diff --git a/Gemfile.lock b/Gemfile.lock
index ab573b4d31e6019575b81195aacc479e587a3bb3..c421713f6a110ad1496a82234e1afc62de142c71 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -584,7 +584,7 @@ GEM
       railties (>= 4.2.0, < 5.1)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (2.0.5)
+    rouge (2.0.6)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)