diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 087b8168ca..1979a1321a 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -50,6 +50,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xlib_libdmx/Config.in
 		source package/x11r7/xlib_libfontenc/Config.in
 		source package/x11r7/xlib_libxkbfile/Config.in
+		source package/x11r7/xlib_libxshmfence/Config.in
 		source package/x11r7/xlib_xtrans/Config.in
 		source package/x11r7/xlib_libpciaccess/Config.in
 	endmenu
diff --git a/package/x11r7/xlib_libxshmfence/Config.in b/package/x11r7/xlib_libxshmfence/Config.in
new file mode 100644
index 0000000000..d0595f6d67
--- /dev/null
+++ b/package/x11r7/xlib_libxshmfence/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_XLIB_LIBXSHMFENCE
+	bool "libxshmfence"
+	select BR2_PACKAGE_XPROTO_XPROTO
+	help
+	  X.Org shmfence library
diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk
new file mode 100644
index 0000000000..f0fb90fed9
--- /dev/null
+++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# xlib_libxshmfence
+#
+################################################################################
+
+XLIB_LIBXSHMFENCE_VERSION = 1.1
+XLIB_LIBXSHMFENCE_SOURCE = libxshmfence-$(XLIB_LIBXSHMFENCE_VERSION).tar.bz2
+XLIB_LIBXSHMFENCE_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXSHMFENCE_LICENSE = MIT
+XLIB_LIBXSHMFENCE_LICENSE_FILES = COPYING
+XLIB_LIBXSHMFENCE_INSTALL_STAGING = YES
+XLIB_LIBXSHMFENCE_DEPENDENCIES = host-pkgconf xproto_xproto
+
+$(eval $(autotools-package))