diff --git a/configure.ac b/configure.ac
index c23ab188173e75374f496a7efd6183eafe70d707..d9b4ed6dd946e89a73809b67d9bf1b53b14214aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,7 +202,7 @@ AC_ARG_WITH([gsm],
 
 LIBGSM=
 AS_IF([test "x$with_gsm" != xno],
-  [AC_CHECK_HEADER([gsm.h], , AC_MSG_FAILURE([Unable to find the libgsm1 headers (you may need to install the dev package).  You may use --without-gsm to compile without gsm codec support.]))]
+  [AC_CHECK_HEADER([gsm/gsm.h], , AC_MSG_FAILURE([Unable to find the libgsm1 headers (you may need to install the dev package).  You may use --without-gsm to compile without gsm codec support.]))]
   [AC_CHECK_LIB([gsm], [gsm_decode],
     [],
     [AC_MSG_FAILURE(
diff --git a/src/audio/codecs/gsmcodec.cpp b/src/audio/codecs/gsmcodec.cpp
index 4fc94e30ed3a62e5ad951f9183be3a24aabc7a96..1ab85f23886324ae5a05523e6144c88ffd04c58f 100644
--- a/src/audio/codecs/gsmcodec.cpp
+++ b/src/audio/codecs/gsmcodec.cpp
@@ -21,7 +21,7 @@
 
 #include "audiocodec.h"
 extern "C"{
-#include <gsm.h>
+#include <gsm/gsm.h>
 }
 
 /**