diff -Naur cyrus-imapd-2.3.15/doc/man/cyradm.1.html cyrus-imapd-2.3.15.oden/doc/man/cyradm.1.html
--- cyrus-imapd-2.3.15/doc/man/cyradm.1.html	2009-09-09 15:19:52.000000000 +0200
+++ cyrus-imapd-2.3.15.oden/doc/man/cyradm.1.html	2009-09-10 11:59:47.000000000 +0200
@@ -240,8 +240,14 @@
 <dd>
 <p>Indicates that the mailbox should have a squat index created for it.</p>
 </dd>
+<dt><strong><a NAME="item__2fexplicit_2fannotation"><code>/explicit/annotation</code></a></strong>
+<dd>
+<p>Sets the annotation <em>/explicit/annotation</em>
+ on <em>mailbox</em> to <em>value</em>.</p>
+</dd>
 </dl>
 </dd>
+
 <dt><strong><a name="renamemailbox_partition_partition_oldname_newname" class="item"><code>renamemailbox</code> [<code>--partition</code> <em>partition</em>] <em>oldname</em> <em>newname</em></a></strong></dt>
 
 <dt><strong><a name="rename_partition_partition_oldname_newname" class="item"><code>rename</code> [<code>--partition</code> <em>partition</em>] <em>oldname</em> <em>newname</em></a></strong></dt>
diff -Naur cyrus-imapd-2.3.15/perl/imap/cyradm.sh cyrus-imapd-2.3.15.oden/perl/imap/cyradm.sh
--- cyrus-imapd-2.3.15/perl/imap/cyradm.sh	2008-04-04 14:47:10.000000000 +0200
+++ cyrus-imapd-2.3.15.oden/perl/imap/cyradm.sh	2009-09-10 11:57:05.000000000 +0200
@@ -241,6 +241,10 @@
 
 Indicates that the mailbox should have a squat index created for it.
 
+=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.3.15/perl/imap/IMAP/Admin.pm cyrus-imapd-2.3.15.oden/perl/imap/IMAP/Admin.pm
--- cyrus-imapd-2.3.15/perl/imap/IMAP/Admin.pm	2008-04-04 14:47:11.000000000 +0200
+++ cyrus-imapd-2.3.15.oden/perl/imap/IMAP/Admin.pm	2009-09-10 11:57:05.000000000 +0200
@@ -797,12 +797,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.3.15/perl/imap/IMAP/Shell.pm cyrus-imapd-2.3.15.oden/perl/imap/IMAP/Shell.pm
--- cyrus-imapd-2.3.15/perl/imap/IMAP/Shell.pm	2008-04-04 15:44:49.000000000 +0200
+++ cyrus-imapd-2.3.15.oden/perl/imap/IMAP/Shell.pm	2009-09-10 11:57:05.000000000 +0200
@@ -127,7 +127,7 @@
 		  [\&_sc_info, '[mailbox]',
 		   'display mailbox/server metadata'],
 		mboxcfg =>
-		  [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value',
+		  [\&_sc_mboxcfg, 'mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value',
 		   'configure mailbox'],
 		mboxconfig => 'mboxcfg',
 		reconstruct =>
@@ -1437,7 +1437,7 @@
   while (defined ($opt = shift(@argv))) {
     last if $opt eq '--';
     if ($opt =~ /^-/) {
-      die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n";
+      die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n";
     }
     else {
       push(@nargv, $opt);
@@ -1446,7 +1446,7 @@
   }
   push(@nargv, @argv);
   if (@nargv < 2) {
-    die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat] value\n";
+    die "usage: mboxconfig mailbox [comment|condstore|expire|news2mail|sharedseen|sieve|squat|/<explicit annotation>] value\n";
   }
   if (!$cyrref || !$$cyrref) {
     die "mboxconfig: no connection to server\n";