diff --git a/include/openbsc/gsm_data_shared.h b/include/openbsc/gsm_data_shared.h
index 86bf557ad..bf7f98b1d 100644
--- a/include/openbsc/gsm_data_shared.h
+++ b/include/openbsc/gsm_data_shared.h
@@ -150,8 +150,10 @@ struct bts_codec_conf {
 
 struct amr_mode {
 	uint8_t mode;
-	uint8_t threshold;
-	uint8_t hysteresis;
+	uint8_t threshold_ms;
+	uint8_t hysteresis_ms;
+	uint8_t threshold_bts;
+	uint8_t hysteresis_bts;
 };
 struct amr_multirate_conf {
 	uint8_t gsm48_ie[2];
@@ -207,7 +209,8 @@ struct gsm_lchan {
 	} encr;
 
 	/* AMR bits */
-	struct gsm48_multi_rate_conf mr_conf;
+	uint8_t mr_ms_lv[7];
+	uint8_t mr_bts_lv[7];
 
 	/* Established data link layer services */
 	uint8_t sapis[8];