diff --git a/examples/riot/Makefile b/examples/riot/Makefile
index 37d3a4ec7c..83235dfc20 100644
--- a/examples/riot/Makefile
+++ b/examples/riot/Makefile
@@ -24,7 +24,19 @@ pkg:
 		git pull --unshallow > /dev/null 2>&1 ; \
 		if [ ! -z "$${RIOT_HASH}" ] ; then \
 			(cd pkg_libcoap/patches ; git format-patch -n $${RIOT_HASH}) ; \
-		fi \
+		fi ; \
+		COMMIT_FILE=pkg_libcoap/patches/9999-Not-Yet-Commited.patch ; \
+		WC=`git diff HEAD -p --stat | wc -l` ; \
+		if [ "$${WC}" != 0 ] ; then \
+		        echo "From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001" > $${COMMIT_FILE}} ; \
+		        echo "From: Internal <test@test.com>" >> $${COMMIT_FILE}} ; \
+		        echo "Date: `date`" >> $${COMMIT_FILE}} ; \
+		        echo "Subject: [PATCH 1/1] RIOT: To commit" >> $${COMMIT_FILE}} ; \
+		        echo "" >> $${COMMIT_FILE}} ; \
+		        echo "---" >> $${COMMIT_FILE}} ; \
+		        git diff HEAD -p --stat >> $${COMMIT_FILE}} ; \
+		        echo "9999-Not-Yet-Commited.patch" ; \
+		fi ; \
 	fi
 	rm -rf RIOT/pkg/libcoap && mkdir RIOT/pkg/libcoap
 	cd pkg_libcoap && cp -r * ../RIOT/pkg/libcoap
diff --git a/examples/riot/pkg_libcoap/Makefile b/examples/riot/pkg_libcoap/Makefile
index f3355a4fb6..4c46505dcb 100644
--- a/examples/riot/pkg_libcoap/Makefile
+++ b/examples/riot/pkg_libcoap/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME=libcoap
 PKG_URL=https://github.com/obgm/libcoap
-PKG_VERSION=0392d022173516b6d33a95b8285ba3cbc8767bdf
+PKG_VERSION=319ffb02c11c5010b26934ba55f50a25ac3b6051
 PKG_LICENSE=BSD-2-Clause
 
 LIBCOAP_BUILD_DIR=$(BINDIR)/pkg/$(PKG_NAME)