--- pri_q931.orig.h	2004-03-30 15:51:24.000000000 -0500
+++ pri_q931.h	2004-03-29 21:16:58.000000000 -0500
@@ -98,13 +98,7 @@
 
 /* Information element format */
 typedef struct q931_ie {
-#if __BYTE_ORDER == __BIG_ENDIAN
-	u_int8_t f:1;
-	u_int8_t ie:7;
-#else
-	u_int8_t ie:7;
-	u_int8_t f:1;
-#endif
+	u_int8_t ie;
 	u_int8_t len;
 	u_int8_t data[0];
 } q931_ie;
@@ -164,9 +158,12 @@
 #define	NATIONAL_CHANGE_STATUS		0x1
 
 /* Q.931 / National ISDN Information Elements */
-#define Q931_LOCKING_SHIFT			0x90
-#define Q931_BEARER_CAPABILITY		0x04
-#define Q931_CAUSE					0x08
+#define Q931_LOCKING_SHIFT_TO_CODESET_6		0x96
+#define Q931_LOCKING_SHIFT_TO_CODESET_7		0x97
+#define Q931_NON_LOCKING_SHIFT_TO_CODESET_6	0x9E
+#define Q931_NON_LOCKING_SHIFT_TO_CODESET_7	0x9F
+#define Q931_BEARER_CAPABILITY			0x04
+#define Q931_CAUSE				0x08
 #define Q931_CALL_STATE				0x14
 #define Q931_CHANNEL_IDENT			0x18
 #define Q931_PROGRESS_INDICATOR		0x1e