diff --git a/ChangeLog b/ChangeLog
index 3bbe0fc9f..7a15ff772 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-02  Clint Adams  <schizo@debian.org>
+
+	* 13889: Completion/Linux/_apm, Completion/Linux/.distfiles,
+	Completion/Unix/Command/_apm, Completion/Unix/Command/.distfiles:
+	Add OpenBSD 2.7 apm options.  Move to Unix/Command.
+
 2001-04-02  Bart Schaefer  <schaefer@zsh.org>
 
 	* 13887: Config/installfns.sh: Skip CVS subdirectories.
diff --git a/Completion/Linux/.distfiles b/Completion/Linux/.distfiles
deleted file mode 100644
index 09fa19330..000000000
--- a/Completion/Linux/.distfiles
+++ /dev/null
@@ -1,4 +0,0 @@
-DISTFILES_SRC='
-.distfiles
-_apm
-'
diff --git a/Completion/Unix/Command/.distfiles b/Completion/Unix/Command/.distfiles
index cbdb13808..7d82a778f 100644
--- a/Completion/Unix/Command/.distfiles
+++ b/Completion/Unix/Command/.distfiles
@@ -13,5 +13,5 @@ _cpio         _getconf      _lp           _pbm          _sudo         _zdump
 _cvs          _gnu_generic  _ls           _perl         _tar          _zip
 _dd           _gprof        _lynx         _perldoc      _telnet
 _dict         _grep         _lzop         _prcs         _tiff
-_diff         _gs           _make         _psutils      _tin
+_diff         _gs           _make         _psutils      _tin	_apm
 '
diff --git a/Completion/Linux/_apm b/Completion/Unix/Command/_apm
similarity index 80%
rename from Completion/Linux/_apm
rename to Completion/Unix/Command/_apm
index 53dc296c3..aedc814e0 100644
--- a/Completion/Linux/_apm
+++ b/Completion/Unix/Command/_apm
@@ -22,8 +22,9 @@ _arguments -C -s \
     '(--ignore)-i[tell the system to ignore system-generated APM message]' \
     '(-i)--ignore[tell the system to ignore system-generated APM message]'
 
-else
-     
+elif [[ $kludge == "freebsd4.1" ]]
+then
+
 _arguments -C \
      '-a[display AC line status]' \
      '-b[display battery status]' \
@@ -37,4 +38,17 @@ _arguments -C \
      '-Z[transition system into standby mode]' \
      '-z[suspend the system]'
 
+elif [[ $kludge == "openbsd2.7" ]]
+then
+
+_arguments -C \
+     '-z[engage suspend mode]' \
+     '-S[engage stand-by mode]' \
+     '-l[display estimated battery lifetime percentage]' \
+     '-m[display estimated battery lifetime minutes]' \
+     '-b[display battery status]' \
+     '-a[display AC line status]' \
+     '-v[verbose]' \
+     '-f[socket]:sockname:_files'
+
 fi