diff --git a/acconfig.h b/acconfig.h
index 0b2f1651e6..49c9678f70 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -51,6 +51,8 @@
 #undef HAVE_LIBSDL
 #undef HAVE_LIBOPENQUICKTIME
 
+#undef GSM_HEADER_IN_SUBDIR
+
 #undef HAVE_ATOMIC_H
 
 #undef GST_DEBUG_ENABLED
diff --git a/configure.ac b/configure.ac
index 830727dbf4..3028b419d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -447,6 +447,12 @@ dnl *** gsm ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_GSM, true)
 GST_CHECK_FEATURE(GSM, [GSM library], gsmenc gsmdec, [
   GST_CHECK_LIBHEADER(GSM, gsm, gsm_create, , gsm.h, GSM_LIBS="-lgsm")
+  if test $HAVE_GSM != "yes"; then
+    GST_CHECK_LIBHEADER(GSM, gsm, gsm_create, , gsm/gsm.h, GSM_LIBS="-lgsm")
+    if test $HAVE_GSM = "yes"; then 
+      AC_DEFINE(GSM_HEADER_IN_SUBDIR)
+    fi
+  fi
   AC_SUBST(GSM_LIBS)
 ])