diff --git a/ChangeLog b/ChangeLog
index 02ce7fcb8..0d3730cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-04  Oliver Kiddle  <opk@zsh.org>
+
+	* 12165: Completion/User/_arp: new completion for arp
+
 2000-07-04  Bart Schaefer  <schaefer@zsh.org>
 
 	* 12160: Completion/Core/compdump: Return failure early if the
diff --git a/Completion/User/_arp b/Completion/User/_arp
new file mode 100755
index 000000000..b550bba63
--- /dev/null
+++ b/Completion/User/_arp
@@ -0,0 +1,15 @@
+#compdef arp
+
+local state line expl curcontext="$curcontext"
+
+_arguments -C \
+ '(-d -s -f 1)-a[show entries for all or specified hosts]:host:->hostintable' \
+ '(-a -s -f 1)-d[delete entry from table]:host:->hostintable' \
+ '(-a -d -f 1)-s[create an arp entry]:host:_hosts:ethernet address::*:option:(temp trail pub)' \
+ '(-a -d -s 1)-f[read multiple entries from file]:file:_files' \
+ '(-a)1:host:->hostintable' && return 0
+
+if [[ "$state" = hostintable ]]; then
+  _wanted hosts expl 'host' compadd ${${${(f)"$(${words[1]} -a)"}##[ ?(]#}%%[ )]*}
+fi
+