diff --git a/pagure/templates/patchfile.html b/pagure/templates/patchfile.html
index f5fae15..3a6d74c 100644
--- a/pagure/templates/patchfile.html
+++ b/pagure/templates/patchfile.html
@@ -3,6 +3,16 @@
 {% block title %}Patch File - {{
     repo.namespace + '/' if repo.namespace }}{{ repo.name }} {% endblock %}
 
+{% block header %}
+<link href="{{ url_for('static', filename='vendor/highlight.js/styles/github.css') }}?version={{ g.version}}"
+  rel="stylesheet" />
+<style>
+  .hljs {
+    background: #fff;
+  }
+</style>
+{% endblock %}
+
 {% block repo %}
 <ul class="nav nav-tabs nav-small border-bottom-0" role="tablist" id="pr-tabs">
   <li class="nav-item pull-xs-right">
@@ -15,9 +25,9 @@
   <strong>{{ patchfile }}</strong>
 </div>
 <div class="card card-block">
-  {% autoescape false %}
-    {{ diff }}
-  {% endautoescape %}
+  <div class="card-body p-0">
+    <pre class="syntaxhighlightblock"><code>{{ diff }}</code></pre>
+  </div>
 </div>
 <p>
   <a href="{{ request.base_url + '?raw=1' }}">View Raw</a>
@@ -26,4 +36,18 @@
 
 {% block jscripts %}
   {{ super() }}
+<script type="text/javascript"
+  src="{{ url_for('static', filename='vendor/highlight.js/highlight.pack.js') }}?version={{ g.version}}"></script>
+<script src="{{ url_for('static', filename='vendor/highlightjs-line-numbers/highlightjs-line-numbers.min.js') }}?version={{ g.version}}"></script>
+<script type="text/javascript"
+  src="{{ url_for('static', filename='vendor/highlight.js/spec.js') }}?version={{ g.version}}"></script>
+
+<script>
+  $(document).ready(function() {
+  $('pre.syntaxhighlightblock code').each(function(i, block) {
+    hljs.highlightBlock(block);
+    hljs.lineNumbersBlock(block);
+  })
+});
+</script>
 {% endblock %}
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index 2c734a5..9bc7d78 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -1470,7 +1470,7 @@ def view_issue_raw_file(repo, filename=None, username=None, namespace=None):
             select="issues",
             repo=repo,
             username=username,
-            diff=data,
+            diff=data.decode('utf-8'),
             patchfile=orig_filename,
         )