diff --git a/ChangeLog b/ChangeLog
index d020f87a8..d3a8c8289 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2005-09-07  Clint Adams  <clint@zsh.org>
 
-	* 21704: Completion/Unix/Command/_date: completion for Solaris,
-	and FreeBSD.
+	* 21704, 21705: Completion/Unix/Command/_date: completion for
+	Solaris, FreeBSD, and OpenBSD.
 
 2005-09-06  Clint Adams  <clint@zsh.org>
 
diff --git a/Completion/Unix/Command/_date b/Completion/Unix/Command/_date
index be00a0f0a..8b1b389aa 100644
--- a/Completion/Unix/Command/_date
+++ b/Completion/Unix/Command/_date
@@ -24,15 +24,25 @@ else
 	  (freebsd*)
 	  _arguments \
 	    '-u[utc]' \
-	    '-j[do not try to set date]' \
 	    '-n[only set time on current machine]' \
 	    '-d:daylight savingg time value:' \
+	    '-j[do not try to set date]' \
 	    '-f:parsing format:' \
 	    '-r:seconds since epoch:' \
 	    '-t:minutes west of GMT:' \
 	    '-v:adjustment value:' \
             ':format or date:'
 	  ;;
+	  (openbsd*)
+	  _arguments \
+	    '-u[utc]' \
+	    '-n[only set time on current machine]' \
+	    '-d:daylight savingg time value:' \
+	    '-a[gradually skew]' \
+	    '-r:seconds since epoch:' \
+	    '-t:minutes west of GMT:' \
+            ':format or date:'
+	  ;;
   esac
 fi