diff --git a/pkg/jsmn/Makefile b/pkg/jsmn/Makefile
new file mode 100644
index 0000000000..d582cc3ad4
--- /dev/null
+++ b/pkg/jsmn/Makefile
@@ -0,0 +1,10 @@
+PKG_NAME=jsmn
+PKG_URL=https://github.com/zserge/jsmn
+PKG_VERSION=b77d84ba48e057aa464b6c6b6f6209e632918cb3
+
+.PHONY: all
+
+all: git-download
+	"$(MAKE)" -C $(PKG_BUILDDIR)
+
+include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/jsmn/Makefile.include b/pkg/jsmn/Makefile.include
new file mode 100644
index 0000000000..c8eef19bb6
--- /dev/null
+++ b/pkg/jsmn/Makefile.include
@@ -0,0 +1 @@
+INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/jsmn
diff --git a/pkg/jsmn/patches/0001-RIOTize-makefile.patch b/pkg/jsmn/patches/0001-RIOTize-makefile.patch
new file mode 100644
index 0000000000..2cbdbc2358
--- /dev/null
+++ b/pkg/jsmn/patches/0001-RIOTize-makefile.patch
@@ -0,0 +1,60 @@
+From e0558697ce92e6d1af952ebcd0fa2a44c24948e0 Mon Sep 17 00:00:00 2001
+From: Kaspar Schleiser <kaspar@schleiser.de>
+Date: Wed, 30 Mar 2016 14:27:26 +0200
+Subject: [PATCH] RIOTize makefile
+
+---
+ Makefile | 42 ++----------------------------------------
+ 1 file changed, 2 insertions(+), 40 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a382d64..64ef249 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,41 +1,3 @@
+-# You can put your build options here
+--include config.mk
+-
+-all: libjsmn.a 
+-
+-libjsmn.a: jsmn.o
+-	$(AR) rc $@ $^
+-
+-%.o: %.c jsmn.h
+-	$(CC) -c $(CFLAGS) $< -o $@
+-
+-test: test_default test_strict test_links test_strict_links
+-test_default: test/tests.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) $< -o test/$@
+-	./test/$@
+-test_strict: test/tests.c
+-	$(CC) -DJSMN_STRICT=1 $(CFLAGS) $(LDFLAGS) $< -o test/$@
+-	./test/$@
+-test_links: test/tests.c
+-	$(CC) -DJSMN_PARENT_LINKS=1 $(CFLAGS) $(LDFLAGS) $< -o test/$@
+-	./test/$@
+-test_strict_links: test/tests.c
+-	$(CC) -DJSMN_STRICT=1 -DJSMN_PARENT_LINKS=1 $(CFLAGS) $(LDFLAGS) $< -o test/$@
+-	./test/$@
+-
+-jsmn_test.o: jsmn_test.c libjsmn.a
+-
+-simple_example: example/simple.o libjsmn.a
+-	$(CC) $(LDFLAGS) $^ -o $@
+-
+-jsondump: example/jsondump.o libjsmn.a
+-	$(CC) $(LDFLAGS) $^ -o $@
+-
+-clean:
+-	rm -f jsmn.o jsmn_test.o example/simple.o
+-	rm -f libjsmn.a
+-	rm -f simple_example
+-	rm -f jsondump
+-
+-.PHONY: all clean test
++SRCS := jsmn.c
+ 
++include $(RIOTBASE)/Makefile.base
+-- 
+2.7.4
+