diff --git a/bootadm/debian/bootadm.bash-completion b/bootadm/debian/bootadm.bash-completion
index 20494b0..89963af 100644
--- a/bootadm/debian/bootadm.bash-completion
+++ b/bootadm/debian/bootadm.bash-completion
@@ -24,11 +24,17 @@ _bootadm () {
     esac
 
     case "$line" in
-    *-archive*-R*)
-        COMPREPLY=( $(compgen -W "-v -n -f -p" -- $cur) )
+    *update-archive*-R*)
+        COMPREPLY=( $(compgen -W "-v -n -f -F -p" -- $cur) )
         ;;
-    *-archive*)
-        COMPREPLY=( $(compgen -W "-v -n -f -R" -- $cur) )
+    *update-archive*)
+        COMPREPLY=( $(compgen -W "-v -n -f -F -R" -- $cur) )
+        ;;
+    *list-archive*-R*)
+        COMPREPLY=( $(compgen -W "-p" -- $cur) )
+        ;;
+    *list-archive*)
+        COMPREPLY=( $(compgen -W "-R" -- $cur) )
         ;;
     *set-menu*-R*)
         COMPREPLY=( $(compgen -W "default= timeout=" -- $cur) )
diff --git a/bootadm/debian/patches/bootadm-manpage.patch b/bootadm/debian/patches/bootadm-manpage.patch
index 4cb694d..4fa366e 100644
--- a/bootadm/debian/patches/bootadm-manpage.patch
+++ b/bootadm/debian/patches/bootadm-manpage.patch
@@ -1,7 +1,22 @@
 Index: bootadm/usr/src/man/man1m/bootadm.1m
 ===================================================================
---- bootadm.orig/usr/src/man/man1m/bootadm.1m	2013-01-02 16:34:16.331123604 +0400
-+++ bootadm/usr/src/man/man1m/bootadm.1m	2013-01-02 16:37:47.349491218 +0400
+--- bootadm.orig/usr/src/man/man1m/bootadm.1m	2012-10-08 04:25:45.000000000 +0400
++++ bootadm/usr/src/man/man1m/bootadm.1m	2013-01-02 17:34:21.582654522 +0400
+@@ -9,12 +9,12 @@
+ .SH SYNOPSIS
+ .LP
+ .nf
+-\fB/sbin/bootadm\fR update-archive [\fB-vn\fR] [\fB-R\fR \fIaltroot\fR [\fB-p\fR \fIplatform\fR]]
++\fB/sbin/bootadm\fR update-archive [\fB-v\fR] [\fB-n\fR] [\fB-F\fR] [\fB-f\fR] [\fB-R\fR \fIaltroot\fR [\fB-p\fR \fIplatform\fR]]
+ .fi
+ 
+ .LP
+ .nf
+-\fB/sbin/bootadm\fR list-archive [\fB-vn\fR] [\fB-R\fR \fIaltroot\fR [\fB-p\fR \fIplatform\fR]]
++\fB/sbin/bootadm\fR list-archive [\fB-R\fR \fIaltroot\fR [\fB-p\fR \fIplatform\fR]]
+ .fi
+ 
+ .LP
 @@ -24,12 +24,12 @@
  
  .LP
@@ -17,7 +32,36 @@ Index: bootadm/usr/src/man/man1m/bootadm.1m
  .fi
  
  .SH DESCRIPTION
-@@ -239,9 +239,9 @@
+@@ -136,6 +136,28 @@
+ .sp
+ .ne 2
+ .na
++\fB\fB-f\fR\fR
++.ad
++.sp .6
++.RS 4n
++In an \fBupdate-archive\fR operation, force creating boot archive from the cache
++updated.
++.RE
++
++.sp
++.ne 2
++.na
++\fB\fB-F\fR\fR
++.ad
++.sp .6
++.RS 4n
++In an \fBupdate-archive\fR operation, purge the cache and create boot archive
++updated.
++.RE
++
++.sp
++.ne 2
++.na
+ \fB\fB-p\fR \fIplatform\fR\fR
+ .ad
+ .sp .6
+@@ -239,9 +261,9 @@
  
  default=0
  timeout=10