diff --git a/packages/textproc/expat/package.mk b/packages/textproc/expat/package.mk
index 8c97404557..5fda0e4c2a 100644
--- a/packages/textproc/expat/package.mk
+++ b/packages/textproc/expat/package.mk
@@ -17,17 +17,22 @@
 ################################################################################
 
 PKG_NAME="expat"
-PKG_VERSION="2.2.0"
-PKG_SHA256="d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff"
+PKG_VERSION="2.2.5"
+PKG_SHA256="b3781742738611eaa737543ee94264dd511c52a3ba7e53111f7d705f6bff65a8"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://expat.sourceforge.net/"
-PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="https://github.com/libexpat/libexpat/archive/R_${PKG_VERSION//./_}.tar.gz"
+PKG_SOURCE_DIR="libexpat-*/expat"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="textproc"
 PKG_SHORTDESC="expat: XML parser library"
 PKG_LONGDESC="Expat is an XML parser library written in C. It is a stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags). An introductory article on using Expat is available on xml.com."
 
-PKG_CMAKE_OPTS_TARGET="-DBUILD_docs=OFF -DBUILD_tools=OFF -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_shared=ON"
-PKG_CMAKE_OPTS_HOST="-DBUILD_docs=OFF -DBUILD_tools=OFF -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_shared=ON"
+PKG_CMAKE_OPTS_TARGET="-DBUILD_doc=OFF -DBUILD_tools=OFF -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_shared=ON"
+PKG_CMAKE_OPTS_HOST="-DBUILD_doc=OFF -DBUILD_tools=OFF -DBUILD_examples=OFF -DBUILD_tests=OFF -DBUILD_shared=ON"
 
+# cleanup
+post_unpack() {
+  rm -fr $BUILD/libexpat-R_${PKG_VERSION//./_}
+}
diff --git a/packages/textproc/expat/patches/expat-0001-allow-disabling-doc-build.patch b/packages/textproc/expat/patches/expat-0001-allow-disabling-doc-build.patch
deleted file mode 100644
index 85f12b13b2..0000000000
--- a/packages/textproc/expat/patches/expat-0001-allow-disabling-doc-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2016-06-21 05:58:38.000000000 -0700
-+++ b/CMakeLists.txt	2017-10-10 09:39:36.713079492 -0700
-@@ -10,6 +10,7 @@
- set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
- set(PACKAGE_TARNAME "${PACKAGE_NAME}")
- 
-+option(BUILD_docs "build the docs for expat library" ON)
- option(BUILD_tools "build the xmlwf tool for expat library" ON)
- option(BUILD_examples "build the examples for expat library" ON)
- option(BUILD_tests "build the tests for expat library" ON)
-@@ -92,8 +93,9 @@
- install(FILES lib/expat.h lib/expat_external.h DESTINATION include)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/expat.pc DESTINATION lib/pkgconfig)
- 
--
--add_custom_command(TARGET expat PRE_BUILD COMMAND $(MAKE) -C doc xmlwf.1)
-+if(BUILD_docs)
-+    add_custom_command(TARGET expat PRE_BUILD COMMAND $(MAKE) -C doc xmlwf.1)
-+endif()
- 
- if(BUILD_tools AND NOT WINCE)
-     set(xmlwf_SRCS