diff --git a/_embed/templates/base.tmpl b/_embed/templates/base.tmpl
index e5caf1f3..b4f297f2 100644
--- a/_embed/templates/base.tmpl
+++ b/_embed/templates/base.tmpl
@@ -125,10 +125,11 @@
                     
                     {{- if .IsDir }}
                     <ul class="dropdown" id="download-drop">
-                        <a data-format="tarbz2" href="?download=tarbz2"><li>tar.bz2</li></a>
-                        <a data-format="targz" href="?download=targz"><li>tar.gz</li></a>
-                        <a data-format="tar" href="?download=tar"><li>tar</li></a>
                         <a data-format="zip" href="?download=zip"><li>zip</li></a>
+                        <a data-format="tar" href="?download=tar"><li>tar</li></a>
+                        <a data-format="targz" href="?download=targz"><li>tar.gz</li></a>
+                        <a data-format="tarbz2" href="?download=tarbz2"><li>tar.bz2</li></a>
+                        <a data-format="tarbz2" href="?download=tarxz"><li>tar.xz</li></a>
                     </ul>
                     {{- end }}
                 </div>
diff --git a/handlers/download.go b/handlers/download.go
index 484be927..86616d43 100644
--- a/handlers/download.go
+++ b/handlers/download.go
@@ -71,6 +71,8 @@ func Download(w http.ResponseWriter, r *http.Request, c *config.Config, i *file.
 		extension, err = ".tar.gz", archiver.TarGz.Make(tempfile, files)
 	case "tarbz2":
 		extension, err = ".tar.bz2", archiver.TarBz2.Make(tempfile, files)
+	case "tarxz":
+		extension, err = ".tar.xz", archiver.TarXZ.Make(tempfile, files)
 	default:
 		return http.StatusNotImplemented, nil
 	}