diff --git a/lorax-templates-qubes/templates/x86.tmpl b/lorax-templates-qubes/templates/x86.tmpl
index ed3e898..8b71de4 100644
--- a/lorax-templates-qubes/templates/x86.tmpl
+++ b/lorax-templates-qubes/templates/x86.tmpl
@@ -43,7 +43,7 @@ sortedkernels = sorted(kernels, key=lambda k: LooseVersion(k['version']))
 %for kernel in sortedkernels:
     # Use short kernel version because of ISO9660 filename length limitation
     <%
-    shortkver = kernel.version.replace('.pvops.qubes','')
+    shortkver = kernel.version.replace('.pvops.qubes','').replace('.x86_64','')
     %>
     %if kernel.flavor:
         ## i386 PAE