diff --git a/gnome/configure.ac b/gnome/configure.ac
index bd9d6df412a7969e32d6a2b24d29a20fbc68c54e..542e7996f0cc9274921bca83962472261a01142d 100644
--- a/gnome/configure.ac
+++ b/gnome/configure.ac
@@ -36,6 +36,7 @@ PKG_CHECK_MODULES(GTK, gtk+-3.0)
 PKG_CHECK_MODULES(GCONF, gconf-2.0)
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.24)
 PKG_CHECK_MODULES(WEBKIT, webkitgtk-3.0)
+PKG_CHECK_MODULES(X11, x11)
 PKG_CHECK_MODULES(JAVASCRIPT_CORE_GTK, javascriptcoregtk-3.0, ,
 		  AC_MSG_RESULT(javascriptcoregtk not installed))
 
diff --git a/gnome/src/Makefile.am b/gnome/src/Makefile.am
index d27a1680da7ca3bede4d7ce16c434b7f9d4d2932..eb80e713779935911dc2f7755b16a91357824bcd 100644
--- a/gnome/src/Makefile.am
+++ b/gnome/src/Makefile.am
@@ -5,7 +5,6 @@ bin_PROGRAMS = sflphone-client-gnome
 SUBDIRS = config contacts dbus widget icons
 
 NOFIFY_LIBS = -lnotify
-X11_LIBS = -lX11
 LD_LIBS = -ldl
 
 SFLPHONEGTK_LIBS=./contacts/libcontacts.la ./config/libconfig.la \
diff --git a/gnome/tests/Makefile.am b/gnome/tests/Makefile.am
index 861a254ea7e9f0c9097c1e58f42fa91ad1953b1b..4cd128b8019fdfd7f8f201b933b2f47d0e0cb287 100644
--- a/gnome/tests/Makefile.am
+++ b/gnome/tests/Makefile.am
@@ -47,6 +47,9 @@ check_dbus_SOURCES = check_dbus.c $(top_srcdir)/src/logger.c \
 
 
 check_dbus_CFLAGS = @CHECK_CFLAGS@ @GTK_CFLAGS@ @DBUSGLIB_CFLAGS@ @GCONF_CFLAGS@ @WEBKIT_CFLAGS@
-check_dbus_LDADD = $(SFLPHONE_LIBS) @CHECK_LIBS@ @GCONF_LIBS@ $(top_builddir)/src/widget/libwidget.la $(top_builddir)/src/icons/libicons.la
+check_dbus_LDADD = $(SFLPHONE_LIBS) @CHECK_LIBS@ @GCONF_LIBS@ \
+				   $(top_builddir)/src/widget/libwidget.la \
+				   $(top_builddir)/src/icons/libicons.la @X11_LIBS@ \
+				   @JAVASCRIPT_CORE_GTK_LIBS@ -ldl
 
 ###########################################################