diff --git a/openbsc/src/gsm_04_80.c b/openbsc/src/gsm_04_80.c
index a49c8b5..4173ade 100644
--- a/openbsc/src/gsm_04_80.c
+++ b/openbsc/src/gsm_04_80.c
@@ -263,6 +263,12 @@
 	msgb_put_u8(msg, GSM_0480_SEQUENCE_TAG);
 	seq_len_ptr = msgb_put(msg, 1);
 
+	/* ss_code for CNAP { */
+	msgb_put_u8(msg, 0x81);
+	msgb_put_u8(msg, 1);
+	msgb_put_u8(msg, 0x19);
+	/* } ss_code */
+
 
 	/* nameIndicator { */
 	msgb_put_u8(msg, 0xB4);
@@ -303,7 +309,7 @@
 	/* ); nameIndicator */
 
 	/* write the lengths... */
-	seq_len_ptr[0] = nam_len_ptr[0] + 2;
+	seq_len_ptr[0] = 3 + nam_len_ptr[0] + 2;
 
 	return msg;
 }