diff --git a/trezorlib/messages/Features.py b/trezorlib/messages/Features.py
index 52858d065e..a57f9042a5 100644
--- a/trezorlib/messages/Features.py
+++ b/trezorlib/messages/Features.py
@@ -32,6 +32,5 @@ class Features(p.MessageType):
         24: ('fw_patch', p.UVarintType, 0),
         25: ('fw_vendor', p.UnicodeType, 0),
         26: ('fw_vendor_keys', p.BytesType, 0),
-        27: ('state', p.BytesType, 0),
     }
     MESSAGE_WIRE_TYPE = 17
diff --git a/trezorlib/messages/MessageType.py b/trezorlib/messages/MessageType.py
index c154ba7eac..8409048cdc 100644
--- a/trezorlib/messages/MessageType.py
+++ b/trezorlib/messages/MessageType.py
@@ -39,6 +39,8 @@ VerifyMessage = 39
 MessageSignature = 40
 PassphraseRequest = 41
 PassphraseAck = 42
+PassphraseStateRequest = 77
+PassphraseStateAck = 78
 EstimateTxSize = 43
 TxSize = 44
 RecoveryDevice = 45
diff --git a/trezorlib/messages/PassphraseAck.py b/trezorlib/messages/PassphraseAck.py
index 4a6bf00d02..f32aae6399 100644
--- a/trezorlib/messages/PassphraseAck.py
+++ b/trezorlib/messages/PassphraseAck.py
@@ -6,6 +6,5 @@ from .. import protobuf as p
 class PassphraseAck(p.MessageType):
     FIELDS = {
         1: ('passphrase', p.UnicodeType, 0),
-        2: ('state', p.BytesType, 0),
     }
     MESSAGE_WIRE_TYPE = 42
diff --git a/trezorlib/messages/PassphraseStateAck.py b/trezorlib/messages/PassphraseStateAck.py
new file mode 100644
index 0000000000..de6b246c45
--- /dev/null
+++ b/trezorlib/messages/PassphraseStateAck.py
@@ -0,0 +1,7 @@
+# Automatically generated by pb2py
+from __future__ import absolute_import
+from .. import protobuf as p
+
+
+class PassphraseStateAck(p.MessageType):
+    MESSAGE_WIRE_TYPE = 78
diff --git a/trezorlib/messages/PassphraseStateRequest.py b/trezorlib/messages/PassphraseStateRequest.py
new file mode 100644
index 0000000000..7e8964f668
--- /dev/null
+++ b/trezorlib/messages/PassphraseStateRequest.py
@@ -0,0 +1,10 @@
+# Automatically generated by pb2py
+from __future__ import absolute_import
+from .. import protobuf as p
+
+
+class PassphraseStateRequest(p.MessageType):
+    FIELDS = {
+        1: ('state', p.BytesType, 0),
+    }
+    MESSAGE_WIRE_TYPE = 77
diff --git a/trezorlib/messages/__init__.py b/trezorlib/messages/__init__.py
index 48aad465ed..d286b5bf42 100644
--- a/trezorlib/messages/__init__.py
+++ b/trezorlib/messages/__init__.py
@@ -96,6 +96,8 @@ from .NEMSignTx import *
 from .NEMSignedTx import *
 from .PassphraseAck import *
 from .PassphraseRequest import *
+from .PassphraseStateAck import *
+from .PassphraseStateRequest import *
 from .PinMatrixAck import *
 from .PinMatrixRequest import *
 from .Ping import *