diff --git a/Makefile.am b/Makefile.am
index 87227ba7..866505d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for libcoap
 #
-# Copyright (C) 2010-2017 Olaf Bergmann <bergmann@tzi.org>
+# Copyright (C) 2010-2019 Olaf Bergmann <bergmann@tzi.org>
 #           (C) 2015-2017 Carsten Schoenert <c.schoenert@t-online.de>
 #
 # This file is part of the CoAP C library libcoap. Please see README and
@@ -23,6 +23,7 @@ EXTRA_DIST = \
   examples/coap_list.h \
   examples/getopt.c \
   include/coap$(LIBCOAP_API_VERSION)/coap_internal.h \
+  include/coap$(LIBCOAP_API_VERSION)/coap_riot.h \
   include/coap$(LIBCOAP_API_VERSION)/coap_session_internal.h \
   include/coap$(LIBCOAP_API_VERSION)/coap_subscribe_internal.h \
   include/coap$(LIBCOAP_API_VERSION)/coap_tcp_internal.h \
diff --git a/include/coap2/coap_riot.h b/include/coap2/coap_riot.h
new file mode 100644
index 00000000..6377392b
--- /dev/null
+++ b/include/coap2/coap_riot.h
@@ -0,0 +1,32 @@
+/* coap_riot.h -- RIOT-specific definitions for libcoap
+ *
+ * Copyright (C) 2019 Olaf Bergmann <bergmann@tzi.org>
+ *
+ * This file is part of the CoAP library libcoap. Please see
+ * README for terms of use.
+ */
+
+#ifndef COAP_RIOT_H_
+#define COAP_RIOT_H_
+
+#ifndef LIBCOAP_MSG_QUEUE_SIZE
+/**
+ * Size of the queue for passing messages between the network
+ * interface and the coap stack. */
+#define LIBCOAP_MSG_QUEUE_SIZE (32U)
+#endif /* LIBCOAP_MSG_QUEUE_SIZE */
+
+#ifndef LIBCOAP_MAX_SOCKETS
+/**
+ * Maximum number of sockets that are simultaneously considered for
+ * reading or writing. */
+#define LIBCOAP_MAX_SOCKETS (16U)
+#endif /* LIBCOAP_MAX_SOCKETS */
+
+/**
+ * This function must be called in the RIOT CoAP thread for
+ * RIOT-specific initialization.
+ */
+void coap_riot_startup(void);
+
+#endif /* COAP_RIOT_H_ */