diff --git a/GSM48.st b/GSM48.st
index ad5127d..c80b80f 100644
--- a/GSM48.st
+++ b/GSM48.st
@@ -486,6 +486,15 @@ GSM48SimpleTag subclass: GSM48CipherModeSetting [
     <gsmElementId: 16r90>
 ]
 
+GSM48SimpleData subclass: GSM48CipherModeSettingResponse [
+    <category: 'OsmoGSM'>
+    <comment: 'I represent a 10.5.2.9 cipher mode setting and the
+    10.5.2.10 cipher response. We still need to implement 4bit values
+    and fix the parser to consume/write only half bits..'>
+    <gsmName: 'cipherModeSettingResponse'>
+    <gsmValueLength: 1>
+]
+
 GSM48SimpleData subclass: GSM48FrequencyChannelSequence [
     <category: 'OsmoGSM'>
     <comment: 'I represent a 10.5.2.12 Frequency channel sequence'>
@@ -2983,6 +2992,22 @@ GSM48RRMessage subclass: GSM48RRChannelRelease [
     ]
 ]
 
+GSM48RRMessage subclass: GSM48RRCipheringModeCommand [
+    <category: 'OsmoGSM'>
+    <comment: 'I represen a GSM 04.08 9.1.9 Ciphering Mode Command'>
+
+    GSM48RRCipheringModeCommand class >> messageType [
+        <category: 'parsing'>
+        ^self msgCipherModeCommand
+    ]
+
+    GSM48RRCipheringModeCommand class >> tlvDescription [
+        ^OrderedCollection new
+            add: GSM48CipherModeSettingResponse asTLVDescription;
+            yourself
+    ]
+]
+
 GSM48RRMessage subclass: GSM48RRClassmarkChange [
     <category: 'OsmoGSM'>
     <comment: 'I represent a GSM 04.08 9.1.11 Classmark'>
@@ -3128,6 +3153,7 @@ Eval [
     GSM48RRHandoverFailure initialize.
     GSM48RRImmediateAssignCommand initialize.
     GSM48RRChannelRelease initialize.
+    GSM48RRCipheringModeCommand initialize.
     GSM48RRClassmarkChange initialize.
     GSM48RRPagingResponse initialize.
     GSM48RRChannelModeModify initialize.
diff --git a/Tests.st b/Tests.st
index ecf8504..6269c3a 100644
--- a/Tests.st
+++ b/Tests.st
@@ -433,6 +433,13 @@ TestCase subclass: GSM48Test [
         self assert: dec channelDescription2 timeSlot = 3.
         self assert: dec channelDescription2 arfcn = 809.
     ]
+
+    testCipheringModeCommand [
+        | dec inp |
+        inp := #(16r06 16r35 16r11) asByteArray.
+        dec := GSM48MSG decode: inp readStream.
+        self assert: dec toMessage asByteArray = inp.
+    ]
 ]
 
 SCCPHandler subclass: TestSCCPHandler [