diff -Naur cyrus-imapd-2.2.13/perl/imap/cyradm.sh cyrus-imapd-2.2.13.oden/perl/imap/cyradm.sh
--- cyrus-imapd-2.2.13/perl/imap/cyradm.sh	2005-11-21 17:39:24.000000000 +0100
+++ cyrus-imapd-2.2.13.oden/perl/imap/cyradm.sh	2006-06-01 17:03:49.000000000 +0200
@@ -231,6 +231,10 @@
 Sets an email address to which messages injected into the server via NNTP 
 will be sent.
 
+=item C</explicit/annotation>
+
+Sets the annotation I</explicit/annotation> on I<mailbox> to I<value>. 
+
 =back 
 
 =item C<renamemailbox> [C<--partition> I<partition>] I<oldname> I<newname>
diff -Naur cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm cyrus-imapd-2.2.13.oden/perl/imap/IMAP/Admin.pm
--- cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm	2005-11-21 17:39:25.000000000 +0100
+++ cyrus-imapd-2.2.13.oden/perl/imap/IMAP/Admin.pm	2006-06-01 17:07:10.000000000 +0200
@@ -791,12 +791,12 @@
     return undef;
   }
 
-  if(!exists($values{$entry})) {
-    $self->{error} = "Unknown parameter $entry";
+  if(exists($values{$entry})) {
+    $entry = $values{$entry};    
+  } else {
+    $self->{error} = "Unknown parameter $entry" unless substr($entry,0,1) eq "/";
   }
 
-  $entry = $values{$entry};
-
   my ($rc, $msg);
 
   $value = undef if($value eq "none");
diff -Naur cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm cyrus-imapd-2.2.13.oden/perl/imap/IMAP/Shell.pm
--- cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm	2006-03-23 16:41:56.000000000 +0100
+++ cyrus-imapd-2.2.13.oden/perl/imap/IMAP/Shell.pm	2006-06-01 17:06:29.000000000 +0200
@@ -126,7 +126,7 @@
 		  [\&_sc_info, '[mailbox]',
 		   'display mailbox/server metadata'],
 		mboxcfg =>
-		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|sieve|squat] value',
+		  [\&_sc_mboxcfg, 'mailbox [comment|news2mail|expire|sieve|squat|/<explicit annotation>] value',
 		   'configure mailbox'],
 		mboxconfig => 'mboxcfg',
 		reconstruct =>
@@ -1400,7 +1400,7 @@
   while (defined ($opt = shift(@argv))) {
     last if $opt eq '--';
     if ($opt =~ /^-/) {
-      die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat] value\n";
+      die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat|/<explicit annotation>] value\n";
     }
     else {
       push(@nargv, $opt);
@@ -1409,7 +1409,7 @@
   }
   push(@nargv, @argv);
   if (@nargv < 2) {
-    die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat] value\n";
+    die "usage: mboxconfig mailbox [comment|news2mail|expire|sieve|squat|/<explicit annotation>] value\n";
   }
   if (!$cyrref || !$$cyrref) {
     die "mboxconfig: no connection to server\n";