diff --git a/package/matchbox-keyboard/Config.in b/package/matchbox-keyboard/Config.in
index b6753f3bec..260a57c6a4 100644
--- a/package/matchbox-keyboard/Config.in
+++ b/package/matchbox-keyboard/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_MATCHBOX_KEYBOARD
 	bool "matchbox-keyboard"
 	select BR2_PACKAGE_XLIB_LIBXTST
+	select BR2_PACKAGE_XLIB_LIBXRENDER
 	select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_MATCHBOX_FAKEKEY
 	select BR2_PACKAGE_MATCHBOX_LIB
diff --git a/package/matchbox-keyboard/matchbox-keyboard.hash b/package/matchbox-keyboard/matchbox-keyboard.hash
index c65fbecff4..43ace650a4 100644
--- a/package/matchbox-keyboard/matchbox-keyboard.hash
+++ b/package/matchbox-keyboard/matchbox-keyboard.hash
@@ -1,4 +1,4 @@
-# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/0.1/matchbox-keyboard-0.1.tar.bz2.md5
-md5	50940321d59fee23b38a4941100abf25	matchbox-keyboard-0.1.tar.bz2
 # Locally computed
-sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
+sha256  44fc6dc6075090d6f8e43f8667cf8a85bed59b7221a5ee81843454c66e352790  matchbox-keyboard-0.1.1.tar.bz2
+sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
+sha256  bba6fd8976fa5c669ddc1378a3d8d49a74263d4d39efb9a90cefb3583a813ecc  applet/applet.c
diff --git a/package/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox-keyboard/matchbox-keyboard.mk
index 23ab5ad7e5..242c4831d1 100644
--- a/package/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox-keyboard/matchbox-keyboard.mk
@@ -4,15 +4,16 @@
 #
 ################################################################################
 
-MATCHBOX_KEYBOARD_VERSION = 0.1
+MATCHBOX_KEYBOARD_VERSION = 0.1.1
 MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2
-MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
-MATCHBOX_KEYBOARD_LICENSE = GPL-2.0+
-MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING
-MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expat
-
-# Workaround bug in configure script
-MATCHBOX_KEYBOARD_CONF_ENV = expat=yes
+MATCHBOX_KEYBOARD_SITE = \
+	http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-keyboard/snapshot
+MATCHBOX_KEYBOARD_LICENSE = LGPL-2.1, GPL-2.0+ (applet.c)
+MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING applet/applet.c
+MATCHBOX_KEYBOARD_DEPENDENCIES = \
+	host-pkgconf matchbox-lib matchbox-fakekey expat xlib_libXrender
+# From git
+MATCHBOX_KEYBOARD_AUTORECONF = YES
 
 define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
 	$(INSTALL) -D -m 0755 package/matchbox-keyboard/mb-applet-kbd-wrapper.sh \
@@ -29,4 +30,11 @@ MATCHBOX_KEYBOARD_CONF_OPTS += --disable-cairo
 MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
 endif
 
+ifeq ($(BR2_PACKAGE_LIBGTK3),y)
+MATCHBOX_KEYBOARD_CONF_OPTS += --enable-gtk3-im
+MATCHBOX_KEYBOARD_DEPENDENCIES += libgtk3
+else
+MATCHBOX_KEYBOARD_CONF_OPTS += --disable-gtk3-im
+endif
+
 $(eval $(autotools-package))