diff --git a/README b/README
index d7fea235549efbfc723e50bec1accc81e39a20fd..278c0257481acaaa64dedbae74d89ca39317401d 100644
--- a/README
+++ b/README
@@ -149,7 +149,7 @@ Extensions and their implementation status:
     encoded-character: full
 
   Other RFCs/drafts:
-    subaddress: full
+    subaddress: full, but not configurable
     comparator-i;ascii-numeric: full
     relational: full 
     copy: full
diff --git a/src/lib-sieve/ext-encoded-character.c b/src/lib-sieve/ext-encoded-character.c
index 293771493fa59cc818575298b695d3c41e2f9262..3c5c7aa48ed0eb64f7893afd9aac012c85732246 100644
--- a/src/lib-sieve/ext-encoded-character.c
+++ b/src/lib-sieve/ext-encoded-character.c
@@ -2,7 +2,7 @@
  * ---------------------------
  *
  * Authors: Stephan Bosch
- * Specification: draft-ietf-sieve-3028bis-13.txt
+ * Specification: RFC5228
  * Implementation: full 
  * Status: experimental, largely untested
  *
diff --git a/src/lib-sieve/ext-envelope.c b/src/lib-sieve/ext-envelope.c
index f8760e2784c23779d3b1fc5a4a138444f53fe44f..4604588166d3f224b3008666bc4c2130f241123b 100644
--- a/src/lib-sieve/ext-envelope.c
+++ b/src/lib-sieve/ext-envelope.c
@@ -2,7 +2,7 @@
  * ------------------
  *
  * Authors: Stephan Bosch
- * Specification: RFC3028, draft-ietf-sieve-3028bis-13.txt
+ * Specification: RFC5228
  * Implementation: full
  * Status: experimental, largely untested
  *
diff --git a/src/lib-sieve/ext-fileinto.c b/src/lib-sieve/ext-fileinto.c
index ae0903b2f15ef28c51a668c638a00b78f55fa91e..9083e18f2ee55a241b2549eee16646522462eef3 100644
--- a/src/lib-sieve/ext-fileinto.c
+++ b/src/lib-sieve/ext-fileinto.c
@@ -2,7 +2,7 @@
  * ------------------
  *
  * Authors: Stephan Bosch
- * Specification: RFC3028, draft-ietf-sieve-3028bis-13.txt
+ * Specification: RFC5228
  * Implementation: full
  * Status: experimental, largely untested
  *
diff --git a/src/lib-sieve/ext-reject.c b/src/lib-sieve/ext-reject.c
index 9e831e27a4bad681946c4cdda6d6ed62306ac5f1..46ca5d52417db72658900f77dcac8bf5270b0859 100644
--- a/src/lib-sieve/ext-reject.c
+++ b/src/lib-sieve/ext-reject.c
@@ -2,7 +2,7 @@
  * ----------------
  *
  * Authors: Stephan Bosch
- * Specification: RFC3028, draft-ietf-sieve-refuse-reject-04
+ * Specification: RFC5228, draft-ietf-sieve-refuse-reject-04
  * Implementation: full  
  * Status: experimental, largely untested
  *
diff --git a/src/lib-sieve/plugins/imapflags/ext-imapflags.c b/src/lib-sieve/plugins/imapflags/ext-imapflags.c
index 24633b46120128f8d79b4d4a218ee5b3db5e17b3..e790c48d411cca8a4dc820056ebc6a46d9b1cfbc 100644
--- a/src/lib-sieve/plugins/imapflags/ext-imapflags.c
+++ b/src/lib-sieve/plugins/imapflags/ext-imapflags.c
@@ -8,10 +8,6 @@
  *
  */
  
-/* FIXME: As long as variables extension is not implemented, this extension will
- * not support the variable parameter to the commands/tests/tags.
- */
-
 #include "lib.h"
 #include "mempool.h"
 #include "str.h"
diff --git a/src/lib-sieve/plugins/include/ext-include.c b/src/lib-sieve/plugins/include/ext-include.c
index def10344cf92ea1138b11332dcb962f7f508c52d..bae9985e0bee1fde573e0ed4ea910f5a97282868 100644
--- a/src/lib-sieve/plugins/include/ext-include.c
+++ b/src/lib-sieve/plugins/include/ext-include.c
@@ -3,7 +3,7 @@
  *
  * Authors: Stephan Bosch
  * Specification: draft-daboo-sieve-include-05
- * Implementation: full, but needs much more work 
+ * Implementation: full, but needs some more work 
  * Status: experimental, largely untested
  * 
  */
diff --git a/src/lib-sieve/plugins/variables/ext-variables.c b/src/lib-sieve/plugins/variables/ext-variables.c
index 03fc7e17d3ba86a101cdb92367406c34be2f4add..7d1885da2a99c794d3d8dd52fe080bfda199f7b8 100644
--- a/src/lib-sieve/plugins/variables/ext-variables.c
+++ b/src/lib-sieve/plugins/variables/ext-variables.c
@@ -3,9 +3,8 @@
  *
  * Authors: Stephan Bosch
  * Specification: RFC 5229
- * Implementation: full variables support, working on support for other 
- *                 extensions.
- * Status: under development
+ * Implementation: mostly full; no support for future namespaces
+ * Status: experimental, largely untested
  *
  */