diff --git a/src/libgee-test.c b/src/libgee-test.c
new file mode 100644
index 00000000..55991ef3
--- /dev/null
+++ b/src/libgee-test.c
@@ -0,0 +1,26 @@
+#include <assert.h>
+#include <glib.h>
+#include <glib-object.h>
+#include <gee.h>
+
+int main (void)
+{
+    GeeArrayList* list;
+    gint i;
+    gpointer p;
+
+    list = gee_array_list_new (G_TYPE_INT, NULL, NULL, NULL, NULL, NULL);
+    gee_abstract_collection_add ((GeeAbstractCollection*) list, (gpointer) ((gintptr) 1));
+    gee_abstract_collection_add ((GeeAbstractCollection*) list, (gpointer) ((gintptr) 2));
+    gee_abstract_collection_add ((GeeAbstractCollection*) list, (gpointer) ((gintptr) 5));
+    gee_abstract_collection_add ((GeeAbstractCollection*) list, (gpointer) ((gintptr) 4));
+    gee_abstract_list_insert ((GeeAbstractList*) list, 2, (gpointer) ((gintptr) 3));
+    gee_abstract_list_remove_at ((GeeAbstractList*) list, 3);
+    gee_abstract_list_set ((GeeAbstractList*) list, 2, (gpointer) ((gintptr) 10));
+    p = gee_abstract_list_get ((GeeAbstractList*) list, 2);
+    i = (gint) ((gintptr) p);
+    assert (10 == i);
+    g_object_unref (list);
+    return 0;
+}
+
diff --git a/src/libgee.mk b/src/libgee.mk
index d156fa77..33662f3e 100644
--- a/src/libgee.mk
+++ b/src/libgee.mk
@@ -3,10 +3,10 @@
 PKG             := libgee
 $(PKG)_WEBSITE  := https://wiki.gnome.org/Projects/Libgee
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.5.0
-$(PKG)_CHECKSUM := aa6a2563867d3e3d56921bd1f7a7869d24599e1b5beb70e83f55b718fdddff51
+$(PKG)_VERSION  := 0.20.1
+$(PKG)_CHECKSUM := bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630
 $(PKG)_SUBDIR   := libgee-$($(PKG)_VERSION)
-$(PKG)_FILE     := libgee-$($(PKG)_VERSION).tar.bz2
+$(PKG)_FILE     := libgee-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://download.gnome.org/sources/libgee/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     := cc glib
 
@@ -20,11 +20,14 @@ endef
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)'
+        $(MXE_CONFIGURE_OPTS) \
+        MAKE=$(MAKE)
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+
+    '$(TARGET)-gcc' \
+        -W -Wall -Werror -ansi \
+        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libgee.exe' \
+        `'$(TARGET)-pkg-config' gee-0.8 gio-2.0 glib-2.0 --cflags --libs`
 endef
 
-$(PKG)_BUILD_SHARED =