diff --git a/configure.in b/configure.in
index 72b6123a..a8b170e0 100644
--- a/configure.in
+++ b/configure.in
@@ -151,14 +151,24 @@ fi
 AC_SUBST(HAVE_PRI)
 
 HAVE_GSM=no
+GSM_INC=""
 AC_ARG_WITH(libgsm,AC_HELP_STRING([--with-libgsm],[use GSM codec if available (default)]),[ac_cv_use_libgsm=$withval],[ac_cv_use_libgsm=yes])
-if [[ "x$ac_cv_use_libgsm" != "xno" ]]; then
-AC_CHECK_HEADER(gsm.h, , [ac_cv_use_libgsm=no])
+if [[ "x$ac_cv_use_libgsm" = "xyes" ]]; then
+for i in /usr/include /usr/include/gsm; do
+    ac_cv_use_libgsm="$i"
+    test -f "$ac_cv_use_libgsm/gsm.h" && break
+done
 fi
 if [[ "x$ac_cv_use_libgsm" != "xno" ]]; then
-AC_CHECK_LIB([gsm], [gsm_create], [HAVE_GSM=yes])
+AC_MSG_CHECKING([for gsm.h in $ac_cv_use_libgsm])
+if [[ -f "$ac_cv_use_libgsm/gsm.h" ]]; then
+    HAVE_GSM=yes
+    GSM_INC="-I$ac_cv_use_libgsm"
+fi
+AC_MSG_RESULT([$HAVE_GSM])
 fi
 AC_SUBST(HAVE_GSM)
+AC_SUBST(GSM_INC)
 
 HAVE_PWLIB=no
 PWLIB_RTTI=none
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 10fd6bb0..8a958dcf 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -143,6 +143,7 @@ faxchan.yate: LOCALLIBS = @SPANDSP_LIB@
 faxchan.yate: LOCALFLAGS = @SPANDSP_INC@
 
 gsmcodec.yate: LOCALLIBS = -lgsm
+gsmcodec.yate: LOCALFLAGS = @GSM_INC@
 
 gtkclient.yate: LOCALFLAGS = @GTK_INC@ @GTK_LIB@