diff --git a/pkg/microcoap/0001-Remove-unneeded-.c-files.patch b/pkg/microcoap/0001-Remove-unneeded-.c-files.patch
new file mode 100644
index 0000000000..76a3846670
Binary files /dev/null and b/pkg/microcoap/0001-Remove-unneeded-.c-files.patch differ
diff --git a/pkg/microcoap/0002-Add-RIOT-Makefile.patch b/pkg/microcoap/0002-Add-RIOT-Makefile.patch
new file mode 100644
index 0000000000..5b297aee3e
Binary files /dev/null and b/pkg/microcoap/0002-Add-RIOT-Makefile.patch differ
diff --git a/pkg/microcoap/Makefile b/pkg/microcoap/Makefile
new file mode 100644
index 0000000000..16614b5ed7
--- /dev/null
+++ b/pkg/microcoap/Makefile
@@ -0,0 +1,42 @@
+PKG_NAME=microcoap
+PKG_URL=git://github.com/1248/microcoap.git
+PKG_VERSION=9cb1dcda2182a8dca8483b230cda8b591a924c82
+PKG_DIR=$(CURDIR)/$(PKG_NAME)
+
+ifneq ($(RIOTBOARD),)
+include $(RIOTBOARD)/$(BOARD)/Makefile.include
+endif
+
+ifneq ($(RIOTBASE),)
+INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \
+			-I$(RIOTBASE)/sys/posix/include -I$(RIOTBASE)/sys/posix/pnet/include
+endif
+
+.PHONY: all clean patch reset
+
+all: patch
+	"$(MAKE)" -C $(PKG_DIR)
+
+patch: $(PKG_DIR)/Makefile
+
+$(PKG_DIR)/Makefile: $(PKG_DIR)/.git/config
+	cd "$(PKG_DIR)" && git am --ignore-whitespace "$(CURDIR)"/*.patch
+
+$(PKG_DIR)/.git/config:
+	test -d "$(PKG_DIR)" || git clone "$(PKG_URL)" "$(PKG_DIR)"; \
+		cd "$(PKG_DIR)" && git checkout -f "$(PKG_VERSION)"
+
+clean::
+	@echo "Cleaning up $(PKG_NAME) package..."
+	@cd "$(PKG_DIR)" 2> /dev/null > /dev/null && \
+		git clean -x -f && \
+		git am --abort && \
+		git reset --hard "$(PKG_VERSION)" && \
+		$(MAKE) patch || true
+
+
+distclean::
+	rm -rf "$(PKG_DIR)"
+
+Makefile.include:
+	@true
diff --git a/pkg/microcoap/Makefile.include b/pkg/microcoap/Makefile.include
new file mode 100644
index 0000000000..53b1fa4e47
--- /dev/null
+++ b/pkg/microcoap/Makefile.include
@@ -0,0 +1 @@
+INCLUDES += -I$(RIOTBASE)/pkg/microcoap/microcoap