diff --git a/pagure/static/vendor/highlightjs-line-numbers/INFO b/pagure/static/vendor/highlightjs-line-numbers/INFO
index 1eaef34..56b6b91 100644
--- a/pagure/static/vendor/highlightjs-line-numbers/INFO
+++ b/pagure/static/vendor/highlightjs-line-numbers/INFO
@@ -1,2 +1,8 @@
-This Plugin is from:
+This is a slightly patched version of the Highlightjs-line-numbers plugin from
+https://github.com/wcoder/highlightjs-line-numbers.js
+
+It adds some additional classes and links on the line numbers to get some stuff
+in Pagure working.
+
+This was patched over this version of the upstream file:
 https://github.com/wcoder/highlightjs-line-numbers.js/blob/59f905d3634e09bfd0cb2f4a6efbc3dde1e2f7c5/dist/highlightjs-line-numbers.min.js
\ No newline at end of file
diff --git a/pagure/static/vendor/highlightjs-line-numbers/highlightjs-line-numbers.min.js b/pagure/static/vendor/highlightjs-line-numbers/highlightjs-line-numbers.min.js
index 6112cb6..f98c85b 100644
--- a/pagure/static/vendor/highlightjs-line-numbers/highlightjs-line-numbers.min.js
+++ b/pagure/static/vendor/highlightjs-line-numbers/highlightjs-line-numbers.min.js
@@ -1 +1 @@
-!function(n,e){"use strict";function t(){var n=e.createElement("style");n.type="text/css",n.innerHTML=h(".{0}{border-collapse:collapse}.{0} td{padding:0}.{1}:before{content:attr({2})}",[f,m,j]),e.getElementsByTagName("head")[0].appendChild(n)}function r(t){"complete"===e.readyState?l(t):n.addEventListener("DOMContentLoaded",function(){l(t)})}function l(t){try{var r=e.querySelectorAll("code.hljs");for(var l in r)r.hasOwnProperty(l)&&i(r[l],t)}catch(o){n.console.error("LineNumbers error: ",o)}}function i(n,e){if("object"==typeof n){e=e||{singleLine:!1};var t=e.singleLine?0:1;u(function(){s(n),n.innerHTML=o(n.innerHTML,t)})}}function o(n,e){var t=c(n);if(""===t[t.length-1].trim()&&t.pop(),t.length>e){for(var r="",l=0,i=t.length;l<i;l++)r+=h('<tr><td class="{0}"><div class="{1} {2}" {3}="{5}"></div></td><td class="{4}"><div class="{1}">{6}</div></td></tr>',[v,g,m,j,p,l+1,t[l].length>0?t[l]:" "]);return h('<table class="{0}">{1}</table>',[f,r])}return n}function s(n){var e=n.childNodes;for(var t in e)if(e.hasOwnProperty(t)){var r=e[t];d(r.textContent)>0&&(r.childNodes.length>0?s(r):a(r.parentNode))}}function a(n){var e=n.className;if(/hljs-/.test(e)){for(var t=c(n.innerHTML),r=0,l="";r<t.length;r++)l+=h('<span class="{0}">{1}</span>\n',[e,t[r]]);n.innerHTML=l.trim()}}function c(n){return 0===n.length?[]:n.split(L)}function d(n){return(n.trim().match(L)||[]).length}function u(e){n.setTimeout(e,0)}function h(n,e){return n.replace(/\{(\d+)\}/g,function(n,t){return e[t]?e[t]:n})}var f="hljs-ln",g="hljs-ln-line",p="hljs-ln-code",v="hljs-ln-numbers",m="hljs-ln-n",j="data-line-number",L=/\r\n|\r|\n/g;n.hljs?(n.hljs.initLineNumbersOnLoad=r,n.hljs.lineNumbersBlock=i,t()):n.console.error("highlight.js not detected!")}(window,document);
\ No newline at end of file
+!function(n,e){"use strict";function t(){var n=e.createElement("style");n.type="text/css",n.innerHTML=h(".{0}{border-collapse:collapse}.{0} td{padding:0}.{1}:before{content:attr({2})}",[f,m,j]),e.getElementsByTagName("head")[0].appendChild(n)}function r(t){"complete"===e.readyState?l(t):n.addEventListener("DOMContentLoaded",function(){l(t)})}function l(t){try{var r=e.querySelectorAll("code.hljs");for(var l in r)r.hasOwnProperty(l)&&i(r[l],t)}catch(o){n.console.error("LineNumbers error: ",o)}}function i(n,e){if("object"==typeof n){e=e||{singleLine:!1};var t=e.singleLine?0:1;u(function(){s(n),n.innerHTML=o(n.innerHTML,t)})}}function o(n,e){var t=c(n);if(""===t[t.length-1].trim()&&t.pop(),t.length>e){for(var r="",l=0,i=t.length;l<i;l++)r+=h('<tr><td class="{0}"><a class="{1} {2}" {3}="{5}" href="#_{5}" id="_{5}"></a></td><td class="{4}"><div class="{1}">{6}</div></td></tr>',[v,g,m,j,p,l+1,t[l].length>0?t[l]:" "]);return h('<table class="{0}">{1}</table>',[f,r])}return n}function s(n){var e=n.childNodes;for(var t in e)if(e.hasOwnProperty(t)){var r=e[t];d(r.textContent)>0&&(r.childNodes.length>0?s(r):a(r.parentNode))}}function a(n){var e=n.className;if(/hljs-/.test(e)){for(var t=c(n.innerHTML),r=0,l="";r<t.length;r++)l+=h('<span class="{0}">{1}</span>\n',[e,t[r]]);n.innerHTML=l.trim()}}function c(n){return 0===n.length?[]:n.split(L)}function d(n){return(n.trim().match(L)||[]).length}function u(e){n.setTimeout(e,0)}function h(n,e){return n.replace(/\{(\d+)\}/g,function(n,t){return e[t]?e[t]:n})}var f="hljs-ln",g="hljs-ln-line notblue text-muted",p="hljs-ln-code pl-2",v="hljs-ln-numbers bg-light text-right pr-2 pl-2 border-right mr-3",m="hljs-ln-n",j="data-line-number",L=/\r\n|\r|\n/g;n.hljs?(n.hljs.initLineNumbersOnLoad=r,n.hljs.lineNumbersBlock=i,t()):n.console.error("highlight.js not detected!")}(window,document);
diff --git a/pagure/templates/file.html b/pagure/templates/file.html
index 300bc43..7a88740 100644
--- a/pagure/templates/file.html
+++ b/pagure/templates/file.html
@@ -173,13 +173,7 @@
         {% endif %}
 
     {% if output_type=='file' %}
-        {% autoescape false %}
-        {% if huge %}
-                {{ content | e | format_loc }}
-        {% else %}
-                {{ content | format_loc }}
-        {% endif %}
-        {% endautoescape %}
+        <pre class="syntaxhighlightblock"><code>{{ content }}</code></pre>
     {% elif output_type == 'markup' %}
         <div class="m-2">
         {% autoescape false %}
@@ -265,47 +259,49 @@ No content found in this repository
 {{ super() }}
 <script type="text/javascript"
   src="{{ url_for('static', filename='vendor/highlight.js/highlight.pack.js') }}"></script>
+<script src="{{ url_for('static', filename='vendor/highlightjs-line-numbers/highlightjs-line-numbers.min.js') }}"></script>
 <script type="text/javascript"
   src="{{ url_for('static', filename='vendor/highlight.js/spec.js') }}"></script>
 
-<script>hljs.initHighlightingOnLoad();</script>
+<script>
+  $(document).ready(function() {
+  $('pre.syntaxhighlightblock code').each(function(i, block) {
+    hljs.highlightBlock(block);
+    hljs.lineNumbersBlock(block);
+  })
+});
+</script>
 
 <script type="text/javascript">
-function updateHighlight() {
-  var cls = "highlighted-line";
-  $('.' + cls).removeClass(cls)
-  if (location.hash !== '') {
-    var lines = location.hash.substr(2).split('-').map(function (x) { return parseInt(x, 10) });
-    for (var i = lines[lines.length - 1]; i >= lines[0]; i--) {
-      $('[data-line-number=' + i + ']').closest('tr').addClass(cls);
+  function updateHighlight() {
+    var cls = "highlighted-line";
+    $('.' + cls).removeClass(cls)
+    if (location.hash !== '') {
+      var lines = location.hash.substr(2).split('-').map(function (x) { return parseInt(x, 10) });
+      for (var i = lines[lines.length - 1]; i >= lines[0]; i--) {
+        $('[data-line-number=' + i + ']').closest('tr').addClass(cls);
+      }
+      return lines;
     }
-    return lines;
-  }
-  return [];
-}
-$(document).ready(function () {
-  var lines = updateHighlight();
-  if (lines) {
-    var offset = $('[data-line-number=' + lines[0] + ']').offset().top;
-    $('html, body').animate({scrollTop: offset}, 200);
-  }
-});
-$(window).on('hashchange', updateHighlight);
-var selected = [];
-$("[data-line-number]").click(function (ev) {
-  var line = $(this).attr('data-line-number');
-  if (ev.shiftKey) {
-    selected = selected.slice(-1).concat(line);
-  } else {
-    selected = [line];
+    return [];
   }
+  $(window).on('hashchange', updateHighlight);
+  var selected = [];
+  $("[data-line-number]").click(function (ev) {
+    var line = $(this).attr('data-line-number');
+    if (ev.shiftKey) {
+      selected = selected.slice(-1).concat(line);
+    } else {
+      selected = [line];
+    }
+
+    var hash = '_' + selected[0];
+    if (selected.length === 2) {
+      hash = '_' + Math.min(selected[0], selected[1]) + '-' + Math.max(selected[0], selected[1]);
+    }
+    window.location.hash = hash;
+    return false;
+  });
+  </script>
 
-  var hash = '_' + selected[0];
-  if (selected.length === 2) {
-    hash = '_' + Math.min(selected[0], selected[1]) + '-' + Math.max(selected[0], selected[1]);
-  }
-  window.location.hash = hash;
-  return false;
-});
-</script>
 {% endblock %}