diff --git a/contrib/ports/CMakeCommon.cmake b/contrib/ports/CMakeCommon.cmake
index 36950509..38763970 100644
--- a/contrib/ports/CMakeCommon.cmake
+++ b/contrib/ports/CMakeCommon.cmake
@@ -1,5 +1,5 @@
 # ARM mbedtls support https://tls.mbed.org/
-set(MBEDTLSDIR ${LWIP_CONTRIB_DIR}/../mbedtls)
+set(MBEDTLSDIR ${LWIP_DIR}/../mbedtls)
 if(EXISTS ${MBEDTLSDIR}/CMakeLists.txt)
     set(LWIP_HAVE_MBEDTLS ON BOOL)
 
diff --git a/contrib/ports/Common.allports.mk b/contrib/ports/Common.allports.mk
index 7e9d2e47..ee4a0bfb 100644
--- a/contrib/ports/Common.allports.mk
+++ b/contrib/ports/Common.allports.mk
@@ -56,7 +56,7 @@ ARFLAGS?=rs
 
 #Set this to where you have the lwip core module checked out from git
 #default assumes it's a dir named lwip at the same level as the contrib module
-LWIPDIR?=$(CONTRIBDIR)/../lwip/src
+LWIPDIR?=$(CONTRIBDIR)/..
 
 CFLAGS+=-I. \
 	-I$(CONTRIBDIR) \
@@ -64,7 +64,7 @@ CFLAGS+=-I. \
 	-I$(LWIPARCH)/include
 
 # Add include path and link to mbedTLS lib if available
-MBEDTLSDIR?=$(CONTRIBDIR)/../mbedtls
+MBEDTLSDIR?=$(LWIPDIR)/../mbedtls
 ifneq (,$(wildcard $(MBEDTLSDIR)/include/mbedtls/*.h))
 LDFLAGS+=-L$(MBEDTLSDIR)/library -lmbedtls -lmbedcrypto -lmbedx509
 CFLAGS+=-I$(MBEDTLSDIR)/include -Wno-redundant-decls -DLWIP_HAVE_MBEDTLS=1 -Wno-c90-c99-compat
diff --git a/contrib/ports/unix/check/CMakeLists.txt b/contrib/ports/unix/check/CMakeLists.txt
index a5063ea9..93afd9dc 100644
--- a/contrib/ports/unix/check/CMakeLists.txt
+++ b/contrib/ports/unix/check/CMakeLists.txt
@@ -7,7 +7,7 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CMAKE_SYSTEM_NAME STREQUAL Darw
 endif()
 
 set(LWIP_CONTRIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-set(LWIP_DIR         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../lwip)
+set(LWIP_DIR         ${LWIP_CONTRIB_DIR}/..)
 
 set(LWIP_USE_SANITIZERS true)
 include(${LWIP_CONTRIB_DIR}/ports/CMakeCommon.cmake)
diff --git a/contrib/ports/unix/example_app/CMakeLists.txt b/contrib/ports/unix/example_app/CMakeLists.txt
index 902c1a6e..3693343d 100644
--- a/contrib/ports/unix/example_app/CMakeLists.txt
+++ b/contrib/ports/unix/example_app/CMakeLists.txt
@@ -5,7 +5,7 @@ project(example_app C)
 set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 set(LWIP_CONTRIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-set(LWIP_DIR         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../lwip)
+set(LWIP_DIR         ${LWIP_DIR}/..)
 
 include(${LWIP_CONTRIB_DIR}/ports/CMakeCommon.cmake)
 
diff --git a/contrib/ports/unix/lib/CMakeLists.txt b/contrib/ports/unix/lib/CMakeLists.txt
index 9c80f868..3ea6bdc6 100644
--- a/contrib/ports/unix/lib/CMakeLists.txt
+++ b/contrib/ports/unix/lib/CMakeLists.txt
@@ -9,7 +9,7 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CMAKE_SYSTEM_NAME STREQUAL GNU)
 endif()
 
 set(LWIP_CONTRIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-set(LWIP_DIR         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../lwip)
+set(LWIP_DIR         ${LWIP_CONTRIB_DIR}/..)
 
 include(${LWIP_CONTRIB_DIR}/ports/CMakeCommon.cmake)
 
diff --git a/contrib/ports/win32/Filelists.cmake b/contrib/ports/win32/Filelists.cmake
index 26c70eaa..487f0226 100644
--- a/contrib/ports/win32/Filelists.cmake
+++ b/contrib/ports/win32/Filelists.cmake
@@ -16,7 +16,7 @@ set(lwipcontribportwindows_SRCS
 )
 
 # pcapif needs WinPcap developer package: https://www.winpcap.org/devel.htm
-set(WPDPACK_DIR ${LWIP_CONTRIB_DIR}/../WpdPack)
+set(WPDPACK_DIR ${LWIP_DIR}/../WpdPack)
 find_library(WPCAP  wpcap  HINTS ${WPDPACK_DIR}/lib)
 find_library(PACKET packet HINTS ${WPDPACK_DIR}/lib)
 
diff --git a/contrib/ports/win32/example_app/CMakeLists.txt b/contrib/ports/win32/example_app/CMakeLists.txt
index 4a91052c..dbdca4a4 100644
--- a/contrib/ports/win32/example_app/CMakeLists.txt
+++ b/contrib/ports/win32/example_app/CMakeLists.txt
@@ -5,7 +5,7 @@ project(example_app C)
 set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 set(LWIP_CONTRIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
-set(LWIP_DIR         ${CMAKE_CURRENT_SOURCE_DIR}/../../../../lwip)
+set(LWIP_DIR         ${LWIP_CONTRIB_DIR}/..)
 
 include(${LWIP_CONTRIB_DIR}/ports/CMakeCommon.cmake)