diff --git a/package/python-m2crypto/python-m2crypto.hash b/package/python-m2crypto/python-m2crypto.hash
index a5231eca81..a2603b987a 100644
--- a/package/python-m2crypto/python-m2crypto.hash
+++ b/package/python-m2crypto/python-m2crypto.hash
@@ -1,2 +1,2 @@
-# From https://pypi.python.org/pypi/M2Crypto/0.21.1
-md5 f93d8462ff7646397a9f77a2fe602d17 M2Crypto-0.21.1.tar.gz
+# From https://pypi.python.org/pypi/M2Crypto/0.22.5
+md5 f84eb07aa1687f39bc26ee7b1ba5a105 M2Crypto-0.22.5.tar.gz
diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk
index 7e46f1d3b4..1f038e39cd 100644
--- a/package/python-m2crypto/python-m2crypto.mk
+++ b/package/python-m2crypto/python-m2crypto.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_M2CRYPTO_VERSION = 0.21.1
+PYTHON_M2CRYPTO_VERSION = 0.22.5
 PYTHON_M2CRYPTO_SITE = http://pypi.python.org/packages/source/M/M2Crypto
 PYTHON_M2CRYPTO_SOURCE = M2Crypto-$(PYTHON_M2CRYPTO_VERSION).tar.gz
 PYTHON_M2CRYPTO_SETUP_TYPE = setuptools
@@ -13,10 +13,16 @@ HOST_PYTHON_M2CRYPTO_DEPENDENCIES = host-openssl host-swig
 # We need to use python2 because m2crypto is not python3 compliant.
 HOST_PYTHON_M2CRYPTO_NEEDS_HOST_PYTHON = python2
 
+HOST_PYTHON_M2CRYPTO_BUILD_DIR = $(@D)/build/lib.linux-$(HOSTARCH)-$(PYTHON_VERSION_MAJOR)
+
 # * We need to override the build commands to be able to use build_ext,
 #   which accepts the --openssl option.
 # * Use python2 interpreter to avoid trying building some python3 objects.
+# * because build_ext is flawed, is forgets to copy the files prior to
+#   the build, so we do it manually.
 define HOST_PYTHON_M2CRYPTO_BUILD_CMDS
+	mkdir -p $(HOST_PYTHON_M2CRYPTO_BUILD_DIR)
+	cp -av $(@D)/M2Crypto $(HOST_PYTHON_M2CRYPTO_BUILD_DIR)/M2Crypto
 	(cd $(@D); \
 		$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \
 		$(HOST_DIR)/usr/bin/python2 setup.py build_ext \