diff --git a/ChangeLog b/ChangeLog
index a496ad17e..91f4fc2cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-03-07  Clint Adams  <clint@zsh.org>
 
+	* 20943: Completion/Linux/Command/_tune2fs: completion for
+	tune2fs command.
+
 	* 20942: Completion/Unix/Command/_showmount: completion for
 	showmount command.
 
diff --git a/Completion/Linux/Command/_tune2fs b/Completion/Linux/Command/_tune2fs
new file mode 100644
index 000000000..74d1a6f08
--- /dev/null
+++ b/Completion/Linux/Command/_tune2fs
@@ -0,0 +1,23 @@
+#compdef tune2fs
+
+_arguments \
+	'-c[max mount count]:number of times:' \
+	'-C[set mount count]:number of times:' \
+	'-e[set error behavior]:error behavior:(continue remount-ro panic)' \
+	'-f[force tune2fs to complete even in the face of errors]' \
+	'-g[set the group which can use reserved filesystem blocks]:group:_groups' \
+	'-i[interval between checks]:duration:' \
+	'-j[add an ext3 journal to the filesystem]' \
+	'-J[journal options]:options:_values -s , size:size: device:blockdevice:_files' \
+	'-l[list the contents of the filesystem superblock]' \
+	'-L[set the volume label of the filesystem]:label:' \
+	'-m[set the percentage of reserved filesystem blocks]:percentage:' \
+	'-M[set the last-mounted directory for the filesystem]:directory:_files -/' \
+	'-o[mount options]:options:_values -s , debug bsdgroups user_xattr acl uid16 journal_data journal_data_ordered journal_data_writeback' \
+	'-O[filesystem features]:features:_values -s , dir_index filetype has_journal sparse_super' \
+	'-r[set the number of reserved filesystem blocks]:number:' \
+	'-s[set sparse super feature]:on or off:(0 1)' \
+	'-T[set time last checked]:time specifier:' \
+	'-u[set user who can use reserved filesystem blocks]:user:_users' \
+	'-U[set filesystem UUID]:UUID or special:(clear random time)' \
+	':device:_files'