diff --git a/ChangeLog b/ChangeLog
index c12b8d5a..1b71df07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-25  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* lib/commonio.h: Added splint annotations.
+
 2009-04-25  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* lib/sgroupio.c: Free allocated structures on failure.
diff --git a/lib/commonio.h b/lib/commonio.h
index f9ece77e..3db75d67 100644
--- a/lib/commonio.h
+++ b/lib/commonio.h
@@ -112,7 +112,7 @@ struct commonio_db {
 	/*
 	 * Operations from above.
 	 */
-	struct commonio_ops *ops;
+	/*@observer@*/const struct commonio_ops *ops;
 
 	/*
 	 * Currently open file stream.
@@ -120,12 +120,12 @@ struct commonio_db {
 	/*@null@*/FILE *fp;
 
 #ifdef WITH_SELINUX
-	security_context_t scontext;
+	/*@null@*/security_context_t scontext;
 #endif
 	/*
 	 * Head, tail, current position in linked list.
 	 */
-	/*@null@*/struct commonio_entry *head, *tail, *cursor;
+	/*@owned@*/ /*@null@*/struct commonio_entry *head, *tail, *cursor;
 
 	/*
 	 * Various flags.