diff --git a/fix-diag-sortorder.diff b/fix-diag-sortorder.diff
new file mode 100644
index 0000000..9d0ca54
--- /dev/null
+++ b/fix-diag-sortorder.diff
@@ -0,0 +1,16 @@
+diff --git a/Filter.py b/Filter.py
+index a728115..87b4009 100644
+--- a/Filter.py
++++ b/Filter.py
+@@ -111,8 +111,9 @@ def printDescriptions(reason):
+ 
+ 
+ def _diag_sortkey(x):
+-    xs = x.split()
+-    return (xs[2], xs[1])
++    xs = x.split(maxsplit=2)
++    # ['game.x86_64:', 'W:', 'call-to-mktemp /usr/games/lib/blub\n']
++    return (xs[2], xs[1], xs[0])
+ 
+ 
+ def printAllReasons():
diff --git a/rpmlint.changes b/rpmlint.changes
index bb2b2cf..db5292a 100644
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -89,7 +89,8 @@ Thu Sep 28 10:40:08 UTC 2017 - dmueller@suse.com
       0001-Extend-scm_regex-to-capture-more-SCM-system-files.patch,
       0003-Tighten-lib_regex-to-avoid-false-positive-in-python-.patch,
       0001-Execute-chroot-tests-also-on-x86-rpms.patch,
-      ignore-readelf-ar-error.diff, remove-ghostfile-checks.diff
+      ignore-readelf-ar-error.diff, remove-ghostfile-checks.diff,
+      fix-diag-sortorder.diff
 - drop config.in: unused
 - switch to python 3.x
 
diff --git a/rpmlint.spec b/rpmlint.spec
index 8441e28..94eae3a 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -96,6 +96,7 @@ Patch59:        0001-Extend-scm_regex-to-capture-more-SCM-system-files.patch
 Patch60:        0003-Tighten-lib_regex-to-avoid-false-positive-in-python-.patch
 Patch61:        0001-Execute-chroot-tests-also-on-x86-rpms.patch
 Patch62:        ignore-readelf-ar-error.diff
+Patch63:        fix-diag-sortorder.diff
 Patch70:        rpmlint-all-pie.patch
 # BuildArch must at the end. is a bug: https://bugzilla.suse.com/show_bug.cgi?id=926766
 BuildArch:      noarch