diff --git a/etc/codecs.conf b/etc/codecs.conf
index bfb9b018f2..80f744267e 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4283,14 +4283,36 @@ audiocodec imaadpcmacm
   driver acm
   dll "imaadp32.acm"
 
+audiocodec ffgsm
+  info "FFmpeg GSM 06.10"
+  status working
+  format 0x204D5347
+  format 0x1500
+  fourcc agsm
+  driver ffmpeg
+  dll "gsm"
+
+audiocodec ffgsmms
+  info "FFmpeg MS GSM"
+  status working
+  format 0x31
+  format 0x32
+  driver ffmpeg
+  dll "gsm_ms"
+
+audiocodec libgsm
+  info "libgsm GSM 06.10"
+  status working
+  format 0x204D5347
+  format 0x1500
+  driver ffmpeg
+  dll "libgsm"
+
 audiocodec libgsmms
   info "libgsm MS GSM"
   status working
   format 0x31
   format 0x32
-  format 0x204D5347
-  format 0x1500
-  fourcc agsm
   driver ffmpeg
   dll "libgsm_ms"