diff --git a/configure.ac b/configure.ac
index 29390c602..b0b0d2106 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,13 @@ AC_ARG_ENABLE([mgcp-transcoding], [AS_HELP_STRING([--enable-mgcp-transcoding], [
 AC_ARG_WITH([g729], [AS_HELP_STRING([--with-g729], [Enable G.729 encoding/decoding.])], [osmo_ac_with_g729="$withval"],[osmo_ac_with_g729="no"])
 
 if test "$osmo_ac_mgcp_transcoding" = "yes" ; then
+    AC_CHECK_HEADERS([gsm.h gsm/gsm.h], [osmo_ac_found_gsm_headers=yes])
+    if test "$osmo_ac_found_gsm_headers" != "yes" ; then
+	AC_MSG_ERROR([Unable to find the libgsm headers])
+    fi
+    AC_SUBST(HAVE_GSM_H)
+    AC_SUBST(HAVE_GSM_GSM_H)
+
     AC_SEARCH_LIBS([gsm_create], [gsm], [LIBRARY_GSM="$LIBS";LIBS=""], [AC_MSG_ERROR([--enable-mgcp-transcoding: cannot find usable libgsm])])
     AC_SUBST(LIBRARY_GSM)
     if test "$osmo_ac_with_g729" = "yes" ; then
diff --git a/include/osmocom/legacy_mgcp/mgcp_transcode.h b/include/osmocom/legacy_mgcp/mgcp_transcode.h
index 147e48bba..6892debc3 100644
--- a/include/osmocom/legacy_mgcp/mgcp_transcode.h
+++ b/include/osmocom/legacy_mgcp/mgcp_transcode.h
@@ -21,7 +21,11 @@
 
 #include "bscconfig.h"
 
+#if HAVE_GSM_H
 #include <gsm.h>
+#elif HAVE_GSM_GSM_H
+#include <gsm/gsm.h>
+#endif
 #ifdef HAVE_BCG729
 #include <bcg729/decoder.h>
 #include <bcg729/encoder.h>