diff --git a/configure.ac b/configure.ac
index 32a593a0..50dc242c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -616,12 +616,12 @@ dnl ** LIBCANBERRA ******************************************************
 dnl *********************************************************************
 
 if test "x$libcanberra" = "xyes" ; then
-	PKG_CHECK_MODULES(LIBCANBERRAGTK, libcanberra-gtk >= 0.22, [], [
+	PKG_CHECK_MODULES(LIBCANBERRA, libcanberra >= 0.22, [], [
 		libcanberra=no
 	])
 	if test "$libcanberra" != "no" ; then
-		GUI_LIBS="$GUI_LIBS $LIBCANBERRAGTK_LIBS"
-		GUI_CFLAGS="$GUI_CFLAGS $LIBCANBERRAGTK_CFLAGS"
+		COMMON_LIBS="$COMMON_LIBS $LIBCANBERRA_LIBS"
+		COMMON_CFLAGS="$COMMON_CFLAGS $LIBCANBERRA_CFLAGS"
 		AC_DEFINE(USE_LIBCANBERRA)
 	fi
 fi
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c
index fe5ad51c..0c3583d3 100644
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -57,7 +57,7 @@
 #endif
 
 #ifdef USE_LIBCANBERRA
-#include <canberra-gtk.h>
+#include <canberra.h>
 #endif
 
 GdkPixmap *channelwin_pix;
@@ -674,7 +674,9 @@ fe_beep (session *sess)
 	}
 #else
 #ifdef USE_LIBCANBERRA
-	if (ca_context_play (ca_gtk_context_get (), 0,
+	ca_context *con;
+	ca_context_create (&con);
+	if (ca_context_play (con, 0,
 					CA_PROP_APPLICATION_NAME, DISPLAY_NAME,
 					CA_PROP_EVENT_ID, "message-new-instant", NULL) != 0)
 #endif