diff --git a/ChangeLog b/ChangeLog
index 6ae5ecf..8dba700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2019-02-22  NIIBE Yutaka  <gniibe@fsij.org>
 
+	* src/gnuk.h (EV_*): Change the values.
+
 	* src/usb-ccid.c (GPG_ACK_TIMEOUT): New.
 	(ccid_thread): Implement timout for the user interaction.
 
diff --git a/chopstx b/chopstx
index b6c90e3..bd330d8 160000
--- a/chopstx
+++ b/chopstx
@@ -1 +1 @@
-Subproject commit b6c90e3df450cf4b33571733211e1ad6849656ac
+Subproject commit bd330d81c3d8d557edcec610b2b7c25390ee3ff0
diff --git a/src/gnuk.h b/src/gnuk.h
index 2082c3d..b5e2e68 100644
--- a/src/gnuk.h
+++ b/src/gnuk.h
@@ -24,18 +24,18 @@ extern struct apdu apdu;
 void ccid_card_change_signal (int how);
 
 /* CCID thread */
-#define EV_RX_DATA_READY      1 /* USB Rx data available  */
-#define EV_EXEC_FINISHED      2 /* OpenPGPcard Execution finished */
+#define EV_CARD_CHANGE        1
+#define EV_TX_FINISHED        2 /* CCID Tx finished  */
 #define EV_EXEC_ACK_REQUIRED  4 /* OpenPGPcard Execution ACK required */
-#define EV_TX_FINISHED        8 /* CCID Tx finished  */
-#define EV_CARD_CHANGE       16
+#define EV_EXEC_FINISHED      8 /* OpenPGPcard Execution finished */
+#define EV_RX_DATA_READY     16 /* USB Rx data available  */
 
 /* OpenPGPcard thread */
-#define EV_PINPAD_INPUT_DONE      1
-#define EV_EXIT                   2
+#define EV_MODIFY_CMD_AVAILABLE   1
+#define EV_VERIFY_CMD_AVAILABLE   2
 #define EV_CMD_AVAILABLE          4
-#define EV_VERIFY_CMD_AVAILABLE   8
-#define EV_MODIFY_CMD_AVAILABLE  16
+#define EV_EXIT                   8
+#define EV_PINPAD_INPUT_DONE     16
 
 /* Maximum cmd apdu data is key import 24+4+256+256 (proc_key_import) */
 #define MAX_CMD_APDU_DATA_SIZE (24+4+256+256) /* without header */