diff --git a/components/lwip/Kconfig b/components/lwip/Kconfig
index 8f38ba9310..911db6fff4 100644
--- a/components/lwip/Kconfig
+++ b/components/lwip/Kconfig
@@ -16,6 +16,13 @@ config LWIP_THREAD_LOCAL_STORAGE_INDEX
 		Specify the thread-local-storage-pointer index for lwip
 		use.
 
+config LWIP_SO_REUSE
+	bool "Enable SO_REUSEADDR option"
+	default 0
+	help
+		Enabling this option allows to bind to a port which remains in 
+		TIME_WAIT.
+
 endmenu
 
 
diff --git a/components/lwip/include/lwip/port/lwipopts.h b/components/lwip/include/lwip/port/lwipopts.h
index 99520f1cd9..2c24b2be92 100755
--- a/components/lwip/include/lwip/port/lwipopts.h
+++ b/components/lwip/include/lwip/port/lwipopts.h
@@ -34,6 +34,7 @@
 
 #include <stdlib.h>
 #include "esp_task.h"
+#include "sdkconfig.h"
 
 /* Enable all Espressif-only options */
 #define LWIP_ESP8266
@@ -404,8 +405,9 @@ extern unsigned char misc_prof_get_tcp_snd_buf(void);
 
 /**
  * SO_REUSE==1: Enable SO_REUSEADDR option.
+ * This option is set via menuconfig.
  */
-#define SO_REUSE                        1
+#define SO_REUSE                        CONFIG_LWIP_SO_REUSE
 
 /*
    ----------------------------------------