diff --git a/dev-python/urllib3/urllib3-1.22.recipe b/dev-python/urllib3/urllib3-1.24.1.recipe
similarity index 55%
rename from dev-python/urllib3/urllib3-1.22.recipe
rename to dev-python/urllib3/urllib3-1.24.1.recipe
index 90e4201a9..919ec0735 100644
--- a/dev-python/urllib3/urllib3-1.22.recipe
+++ b/dev-python/urllib3/urllib3-1.24.1.recipe
@@ -13,13 +13,14 @@ upon.
 
 For a more comprehensive solution, have a look at \
 Requests <http://python-requests.org/> which is also powered by urllib3"
-HOMEPAGE="http://urllib3.readthedocs.org/
-	https://pypi.python.org/pypi/urllib3"
-COPYRIGHT="2008-2014 Andrey Petrov and contributors"
+HOMEPAGE="https://urllib3.readthedocs.io/
+	https://pypi.org/project/urllib3/
+	https://github.com/urllib3/urllib3"
+COPYRIGHT="2008-2018 Andrey Petrov and contributors"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://github.com/shazow/urllib3/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="dd60d4104b871943e06be69e296e97ede9d42edf6ba534f0268aee932a601e2a"
+CHECKSUM_SHA256="28e9d2476aab8d06752ef465b692832efc5d095d3a3128efd773c056ff04e5a0"
 SOURCE_FILENAME="urllib3-$portVersion.tar.gz"
 
 ARCHITECTURES="any"
@@ -33,41 +34,60 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku_devel
+	setuptools_python
+	setuptools_python3
+	"
+BUILD_PREREQUIRES="
+	cmd:python
+	cmd:python3
 	"
 
 PYTHON_PACKAGES=(python python3)
 PYTHON_VERSIONS=(2.7 3.6)
 for i in "${!PYTHON_PACKAGES[@]}"; do
-pythonPackage=${PYTHON_PACKAGES[i]}
-pythonVersion=${PYTHON_VERSIONS[$i]}
-eval "PROVIDES_${pythonPackage}=\"\
-	${portName}_$pythonPackage = $portVersion\
-	\"; \
-REQUIRES_$pythonPackage=\"\
-	haiku\n\
-	cmd:python$pythonVersion\
-	\""
-BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_$pythonPackage"
-BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-	cmd:python$pythonVersion"
+	pythonPackage=${PYTHON_PACKAGES[i]}
+	pythonVersion=${PYTHON_VERSIONS[$i]}
+	eval "PROVIDES_$pythonPackage=\"
+		${portName}_$pythonPackage = $portVersion
+		\""
+	eval "REQUIRES_$pythonPackage=\"
+		haiku
+		cmd:python$pythonVersion
+		\""
 done
 
+
+BUILD()
+{
+	for i in "${!PYTHON_PACKAGES[@]}"; do
+		pythonPackage=${PYTHON_PACKAGES[i]}
+		pythonVersion=${PYTHON_VERSIONS[$i]}
+
+		rm -rf "$sourceDir"-$pythonPackage
+		cp -a "$sourceDir" "$sourceDir"-$pythonPackage
+		cd "$sourceDir"-$pythonPackage
+
+		python=python$pythonVersion
+		$python setup.py build
+	done
+}
+
 INSTALL()
 {
 	for i in "${!PYTHON_PACKAGES[@]}"; do
 		pythonPackage=${PYTHON_PACKAGES[i]}
 		pythonVersion=${PYTHON_VERSIONS[$i]}
 
+		cd "$sourceDir"-$pythonPackage
+
 		python=python$pythonVersion
 		installLocation=$prefix/lib/$python/vendor-packages/
-		export PYTHONPATH=$installLocation:$PYTHONPATH
+		export PYTHONPATH=$installLocation
 		mkdir -p $installLocation
-		rm -rf build
-		$python setup.py build install \
-			--root=/ --prefix=$prefix
+		$python setup.py install \
+			--root=/ --prefix="$prefix"
 
-		packageEntries  $pythonPackage \
-			$prefix/lib/python*
+		packageEntries $pythonPackage \
+			"$prefix"/lib/$python
 	done
 }