diff --git a/pkg/lwip/Makefile b/pkg/lwip/Makefile
index 9aef775e4000db601ed6424339a166f90b82f05a..d564d1fce12427aa990f46f29d1581b67b7b551b 100644
--- a/pkg/lwip/Makefile
+++ b/pkg/lwip/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME=lwip
 PKG_URL=git://git.savannah.nongnu.org/lwip.git
-PKG_VERSION=fd4a109ffa6513b28a0c780a952cef1110423717
+PKG_VERSION=STABLE-2_0_2_RELEASE_VER
 PKG_LICENSE=BSD-3-Clause
 
 .PHONY: all
diff --git a/pkg/lwip/contrib/sock/lwip_sock.c b/pkg/lwip/contrib/sock/lwip_sock.c
index a46790b04c41dfdf9da1e798a35b71d8395ee41b..dba775c17d9375a8676fe9afd24a5199d7faa1dd 100644
--- a/pkg/lwip/contrib/sock/lwip_sock.c
+++ b/pkg/lwip/contrib/sock/lwip_sock.c
@@ -249,6 +249,11 @@ static int _create(int type, int proto, uint16_t flags, struct netconn **out)
     if ((*out = netconn_new_with_proto_and_callback(type, proto, NULL)) == NULL) {
         return -ENOMEM;
     }
+#if LWIP_IPV4 && LWIP_IPV6
+    if (type & NETCONN_TYPE_IPV6) {
+        netconn_set_ipv6only(*out, 1);
+    }
+#endif
 #if SO_REUSE
     if (flags & SOCK_FLAGS_REUSE_EP) {
         ip_set_option((*out)->pcb.ip, SOF_REUSEADDR);
diff --git a/pkg/lwip/contrib/sock/tcp/lwip_sock_tcp.c b/pkg/lwip/contrib/sock/tcp/lwip_sock_tcp.c
index df879ac3a9ea3d688e507c9762a9e53371472d0f..77ee9b894abe19269dad19c87d3e318770814836 100644
--- a/pkg/lwip/contrib/sock/tcp/lwip_sock_tcp.c
+++ b/pkg/lwip/contrib/sock/tcp/lwip_sock_tcp.c
@@ -27,7 +27,6 @@ static inline void _tcp_sock_init(sock_tcp_t *sock, struct netconn *conn,
 {
     mutex_init(&sock->mutex);
     mutex_lock(&sock->mutex);
-    netconn_set_noautorecved(conn, 1);
     sock->conn = conn;
     sock->queue = queue;
     sock->last_buf = NULL;
@@ -340,8 +339,6 @@ ssize_t sock_tcp_read(sock_tcp_t *sock, void *data, size_t max_len,
         }
     }
     if (offset > 0) {
-        /* inform lwIP how much we receive*/
-        netconn_recved(sock->conn, (u32_t)offset);
         res = offset;   /* we received data so return it */
     }
     /* unset flags */
diff --git a/pkg/lwip/contrib/sys_arch.c b/pkg/lwip/contrib/sys_arch.c
index 6eec97f3e1b0156edb094903aaf64469ea15b1fe..2794122b0d789c123e29d1ee94e668bb9b9d46bc 100644
--- a/pkg/lwip/contrib/sys_arch.c
+++ b/pkg/lwip/contrib/sys_arch.c
@@ -36,6 +36,11 @@ void sys_init(void)
     return;
 }
 
+u32_t sys_now(void)
+{
+    return (uint32_t)(xtimer_now_usec64() / US_PER_MS);
+}
+
 err_t sys_mutex_new(sys_mutex_t *mutex)
 {
     mutex_init((mutex_t *)mutex);
diff --git a/pkg/lwip/include/arch/cc.h b/pkg/lwip/include/arch/cc.h
index 663efe794a9384d266d2eaded90c6d19e2dfc94e..d4a943684b0b1ff893d24ff3ae55cb76939427b8 100644
--- a/pkg/lwip/include/arch/cc.h
+++ b/pkg/lwip/include/arch/cc.h
@@ -43,23 +43,6 @@ extern "C" {
 #endif
 #endif
 
-/**
- * @brief   Generic types for lwIP
- * @{
- */
-typedef uint8_t u8_t;                   /**< unsigned 8-bit type */
-typedef int8_t  s8_t;                   /**< signed 8-bit type */
-typedef uint16_t u16_t;                 /**< unsigned 16-bit type */
-typedef int16_t  s16_t;                 /**< signed 16-bit type */
-typedef uint32_t u32_t;                 /**< unsigned 32-bit type */
-typedef int32_t  s32_t;                 /**< signed 32-bit type */
-
-typedef unsigned long mem_ptr_t;        /**< A generic pointer type. It has to be an integer type
-                                         *   (not void*, due to some pointer arithmetics). */
-/**
- * @}
- */
-
 /**
  * @brief   (sn)printf formatters for the generic lwIP types
  * @{
diff --git a/pkg/lwip/include/lwipopts.h b/pkg/lwip/include/lwipopts.h
index 6dedf10f5a906121fe03513236aa52da2d7750a1..c6632eec01040ba5f71837faf614720c12924d89 100644
--- a/pkg/lwip/include/lwipopts.h
+++ b/pkg/lwip/include/lwipopts.h
@@ -136,6 +136,8 @@ extern "C" {
 #endif
 
 #define LWIP_SOCKET             (0)
+
+#define LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS
 #define MEMP_MEM_MALLOC         (1)
 #define NETIF_MAX_HWADDR_LEN    (GNRC_NETIF_HDR_L2ADDR_MAX_LEN)
 
diff --git a/pkg/lwip/patches/0001-Fix-warnings.patch b/pkg/lwip/patches/0001-Fix-warnings.patch
index be2dc43362fd059adcd7bc5c15f36cd4623f1da5..c90f306ba72ebeebda08e245e705f1de5a13594c 100644
Binary files a/pkg/lwip/patches/0001-Fix-warnings.patch and b/pkg/lwip/patches/0001-Fix-warnings.patch differ
diff --git a/pkg/lwip/patches/0002-Add-RIOT-Makefiles.patch b/pkg/lwip/patches/0002-Add-RIOT-Makefiles.patch
index 4b9ec25d1941e21fd4763a8b8ae05497e4399650..d6e0000b72d9f96bc7d152fb5b40c34b9a10931d 100644
Binary files a/pkg/lwip/patches/0002-Add-RIOT-Makefiles.patch and b/pkg/lwip/patches/0002-Add-RIOT-Makefiles.patch differ