diff --git a/Makefile.dep b/Makefile.dep
index 554aaf5e6a..7d78585519 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -354,6 +354,11 @@ ifneq (,$(filter posix_semaphore,$(USEMODULE)))
   USEMODULE += xtimer
 endif
 
+ifneq (,$(filter lwip,$(USEMODULE)))
+  USEPKG += lwip
+  USEMODULE += lwip_core
+endif
+
 ifneq (,$(filter sema,$(USEMODULE)))
   USEMODULE += xtimer
 endif
diff --git a/pkg/lwip/Makefile b/pkg/lwip/Makefile
new file mode 100644
index 0000000000..ea3d93ed5e
--- /dev/null
+++ b/pkg/lwip/Makefile
@@ -0,0 +1,11 @@
+PKG_NAME=lwip
+PKG_URL=git://git.savannah.nongnu.org/lwip.git
+PKG_VERSION=fd4a109ffa6513b28a0c780a952cef1110423717
+PKG_BUILDDIR ?= $(BINDIRBASE)/pkg/$(BOARD)/$(PKG_NAME)
+
+.PHONY: all
+
+all: git-download
+	$(MAKE) -C $(PKG_BUILDDIR)
+
+include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/lwip/Makefile.include b/pkg/lwip/Makefile.include
new file mode 100644
index 0000000000..e944a48255
--- /dev/null
+++ b/pkg/lwip/Makefile.include
@@ -0,0 +1,2 @@
+INCLUDES += -I$(RIOTBASE)/pkg/lwip/include \
+            -I$(BINDIRBASE)/pkg/$(BOARD)/lwip/src/include
diff --git a/pkg/lwip/doc.txt b/pkg/lwip/doc.txt
new file mode 100644
index 0000000000..7c603ca11d
--- /dev/null
+++ b/pkg/lwip/doc.txt
@@ -0,0 +1,6 @@
+/**
+ * @defgroup pkg_lwip   lwIP network stack
+ * @ingroup pkg
+ * @brief   Provides the lwIP network stack
+ * @see     http://savannah.nongnu.org/projects/lwip/
+ */
diff --git a/pkg/lwip/patches/0001-Fix-warnings.patch b/pkg/lwip/patches/0001-Fix-warnings.patch
new file mode 100644
index 0000000000..be2dc43362
Binary files /dev/null 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
new file mode 100644
index 0000000000..4b9ec25d19
Binary files /dev/null and b/pkg/lwip/patches/0002-Add-RIOT-Makefiles.patch differ