diff --git a/apps/er-coap/Makefile.er-coap b/apps/er-coap/Makefile.er-coap
index 5a13792de..c49e6d26e 100755
--- a/apps/er-coap/Makefile.er-coap
+++ b/apps/er-coap/Makefile.er-coap
@@ -7,6 +7,15 @@ CFLAGS += -DREST=coap_rest_implementation
 
 ifeq ($(WITH_DTLS_COAP),1)
 er-coap_src += er-coap-dtls.c
+
+# Load tinydtls
+APPS += tinydtls
+$(CONTIKI)/apps/tinydtls/Makefile.tinydtls:
+	@echo "    You should run 'git submodule update --init' to clone 'app/tinydtls'"
+	@exit 1
+include $(CONTIKI)/apps/tinydtls/Makefile.tinydtls
+PROJECTDIRS+=$(CONTIKI)/apps/tinydtls/aes $(CONTIKI)/apps/tinydtls/sha2 $(CONTIKI)/apps/tinydtls/ecc
+
 else
 er-coap_src += er-coap-udp.c
 endif