diff --git a/include/gapk/formats.h b/include/gapk/formats.h
index cac0956..cb5e2fd 100644
--- a/include/gapk/formats.h
+++ b/include/gapk/formats.h
@@ -46,6 +46,7 @@
 	/* Texas Instrument calypso/locosto buffer format */
 	FMT_TI_HR,
 	FMT_TI_FR,
+	FMT_TI_EFR,
 
 	_FMT_MAX,
 };
diff --git a/src/fmt_ti.c b/src/fmt_ti.c
index e2bb14a..646c74a 100644
--- a/src/fmt_ti.c
+++ b/src/fmt_ti.c
@@ -132,3 +132,91 @@
 	.conv_from_canon	= ti_fr_from_canon,
 	.conv_to_canon		= ti_fr_to_canon,
 };
+
+
+static int
+ti_efr_from_canon(uint8_t *dst, const uint8_t *src)
+{
+	int i;
+
+	memset(dst, 0x00, 33); /* pre-clear */
+
+	for (i=0; i<244; i++) {
+		int si, tsi = gsm660_bitorder[i];
+		int di = i >= 182 ? i+4 : i;
+
+		if (tsi < 71)
+			si = tsi;
+		else if (tsi < 73)
+			continue; /* repeated bits */
+		else if (tsi < 123)
+			si = tsi - 2;
+		else if (tsi < 125)
+			continue; /* repeated bits */
+		else if (tsi < 178)
+			si = tsi - 4;
+		else if (tsi < 180)
+			continue; /* repeated bits */
+		else if (tsi < 230)
+			si = tsi - 6;
+		else if (tsi < 232)
+			continue; /* repeated bits */
+		else if (tsi < 252)
+			si = tsi - 8;
+		else
+			continue; /* CRC poly */
+
+		msb_put_bit(dst, di, msb_get_bit(src, si));
+	}
+
+	return 0;
+}
+
+static int
+ti_efr_to_canon(uint8_t *dst, const uint8_t *src)
+{
+	int i;
+
+	dst[30] = 0x00; /* last nibble won't written, pre-clear it */
+
+	for (i=0; i<244; i++) {
+		int si = i >= 182 ? i+4 : i;
+		int di, tdi = gsm660_bitorder[i];
+
+		if (tdi < 71)
+			di = tdi;
+		else if (tdi < 73)
+			continue; /* repeated bits */
+		else if (tdi < 123)
+			di = tdi - 2;
+		else if (tdi < 125)
+			continue; /* repeated bits */
+		else if (tdi < 178)
+			di = tdi - 4;
+		else if (tdi < 180)
+			continue; /* repeated bits */
+		else if (tdi < 230)
+			di = tdi - 6;
+		else if (tdi < 232)
+			continue; /* repeated bits */
+		else if (tdi < 252)
+			di = tdi - 8;
+		else
+			continue; /* CRC poly */
+
+		msb_put_bit(dst, di, msb_get_bit(src, si));
+	}
+
+	return 0;
+}
+
+const struct format_desc fmt_ti_efr = {
+	.type			= FMT_TI_EFR,
+	.codec_type		= CODEC_EFR,
+	.name			= "ti-efr",
+	.description		= "Texas Instrument EFR TCH/F buffer format",
+
+	.frame_len		= 33,
+	.conv_from_canon	= ti_efr_from_canon,
+	.conv_to_canon		= ti_efr_to_canon,
+};
diff --git a/src/formats.c b/src/formats.c
index af21705..c776115 100644
--- a/src/formats.c
+++ b/src/formats.c
@@ -33,6 +33,7 @@
 extern const struct format_desc fmt_rawpcm_s16le;
 extern const struct format_desc fmt_ti_hr;
 extern const struct format_desc fmt_ti_fr;
+extern const struct format_desc fmt_ti_efr;
 
 static const struct format_desc *supported_formats[_FMT_MAX] = {
 	[FMT_INVALID]		= NULL,
@@ -46,6 +47,7 @@
 	[FMT_RAWPCM_S16LE]	= &fmt_rawpcm_s16le,
 	[FMT_TI_HR]		= &fmt_ti_hr,
 	[FMT_TI_FR]		= &fmt_ti_fr,
+	[FMT_TI_EFR]		= &fmt_ti_efr,
 };