diff --git a/ChangeLog b/ChangeLog
index 818c6520e..e97da8e84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-01 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+
+	* 13861: Completion/Linux/_apm: Completion for apm command (linux only).
+
 2001-03-30  Clint Adams  <schizo@debian.org>
 
 	* 13860: Completion/Debian/_deb_packages: caching layer support.
diff --git a/Completion/Linux/.distfiles b/Completion/Linux/.distfiles
index e99912a5c..6bf933087 100644
--- a/Completion/Linux/.distfiles
+++ b/Completion/Linux/.distfiles
@@ -1,5 +1,6 @@
 DISTFILES_SRC='
     .distfiles
     _rpm
+	_apm
 '
 
diff --git a/Completion/Linux/_apm b/Completion/Linux/_apm
new file mode 100644
index 000000000..d97afcd05
--- /dev/null
+++ b/Completion/Linux/_apm
@@ -0,0 +1,17 @@
+#compdef apm
+_arguments -C -s \
+    '(--version)-V[print the apm program and exit immediately]' \
+    '(-V)--version[print the apm program and exit immediately]' \
+    '(--verbose)-v[print information about APM BIOS and Linux APM driver version]' \
+    '(-v)--verbose[print information about APM BIOS and Linux APM driver version]' \
+    '(--minutes)-m[print total minutes remaining instead of using an hh:mm format]' \
+    '(-m)--minutes[print total minutes remaining instead of using an hh:mm format]' \
+    '(--suspend)-s[put the machine into suspend mode if possible]' \
+    '(-s)--suspend[put the machine into suspend mode if possible]' \
+    '(--stanbdby)-S[put the machine into standby mode if possible]' \
+    '(-S)--standby[put the machine into standby mode if possible]' \
+    '(--noignore)-n[tell the system not to ignore system-generated APM message]' \
+    '(-n)--noignore[tell the system not to ignore system-generated APM message]' \
+    '(--ignore)-i[tell the system to ignore system-generated APM message]' \
+    '(-i)--ignore[tell the system to ignore system-generated APM message]'
+