diff --git a/CHANGES b/CHANGES
index 2ffeacaa..6705d1a8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -26,7 +26,7 @@ bash-completion (2.x)
   * Apply pine completion to alpine too.
   * Remove many unnecessary short option completions where long ones exist.
   * Improve chsh, chgrp, chown, configure, cvs, find, gkrellm, gzip, iconv,
-    lftp, look, make, man, mdadm, modprobe, mount, mplayer, mysqladmin,
+    lftp, look, lzma, make, man, mdadm, modprobe, mount, mplayer, mysqladmin,
     perldoc, rsync, screen, service, scp, ssh, sshfs, update-alternatives,
     vncviewer, wget, yp-tools, and general hostname completions.
   * Add abook and wtf completion, based on work by Raphaël Droz.
diff --git a/contrib/lzma b/contrib/lzma
index 8f14e489..e015ef8e 100644
--- a/contrib/lzma
+++ b/contrib/lzma
@@ -19,7 +19,7 @@ _lzma()
 
     local IFS=$'\t\n'
 
-    xspec="*.lzma"
+    xspec="*.@(lzma|tlz)"
     if [[ "$prev" == --* ]]; then
         [[ "$prev" == --decompress || \
             "$prev" == --list || \
diff --git a/test/completion/lzma.exp b/test/completion/lzma.exp
new file mode 100644
index 00000000..8d3f637b
--- /dev/null
+++ b/test/completion/lzma.exp
@@ -0,0 +1 @@
+assert_source_completions lzma
diff --git a/test/lib/completions/lzma.exp b/test/lib/completions/lzma.exp
new file mode 100644
index 00000000..79d78854
--- /dev/null
+++ b/test/lib/completions/lzma.exp
@@ -0,0 +1,26 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "lzma "
+
+
+sync_after_int
+
+
+assert_complete "a/ bashcomp.lzma bashcomp.tlz" "lzma -d fixtures/xz/"
+
+
+sync_after_int
+
+
+teardown