diff --git a/dev-python/mako/python3_mako-1.0.1.recipe b/dev-python/mako/python3_mako-1.0.1.recipe
new file mode 100644
index 000000000..746f3053c
--- /dev/null
+++ b/dev-python/mako/python3_mako-1.0.1.recipe
@@ -0,0 +1,52 @@
+SUMMARY="Hyperfast and lightweight templating for the Python platform."
+DESCRIPTION="
+Mako is a Hyperfast and lightweight templating system for the Python platform
+"
+HOMEPAGE="http://www.makotemplates.org"
+SRC_URI="https://pypi.python.org/packages/source/M/Mako/Mako-1.0.1.tar.gz"
+CHECKSUM_SHA256="45f0869febea59dab7efd256fb451c377cbb7947bef386ff0bb44627c31a8d1c"
+LICENSE="MIT"
+COPYRIGHT="Copyright (C) 2006-2015 the Mako authors and contributors"
+REVISION="1"
+
+ARCHITECTURES="arm ppc x86 x86_gcc2 x86_64"
+
+SOURCE_DIR="Mako-$portVersion"
+
+PROVIDES="
+	python3_mako = $portVersion
+	cmd:mako_render
+	"
+
+REQUIRES="
+	haiku
+	cmd:python3
+	"
+
+BUILD_REQUIRES="
+	python3_setuptools
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel
+	cmd:python3
+	cmd:gcc
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python3/bin/python3 setup.py build
+}
+
+INSTALL()
+{
+	# GENERIC: all python_setuptools-based installs need this
+	python=$portPackageLinksDir/cmd~python3/bin/python3
+	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation
+
+	$python setup.py install \
+		--prefix=$prefix
+}
diff --git a/dev-python/mako/python_mako-1.0.1.recipe b/dev-python/mako/python_mako-1.0.1.recipe
index 9585d4679..3b521a4c6 100644
--- a/dev-python/mako/python_mako-1.0.1.recipe
+++ b/dev-python/mako/python_mako-1.0.1.recipe
@@ -7,7 +7,7 @@ SRC_URI="https://pypi.python.org/packages/source/M/Mako/Mako-1.0.1.tar.gz"
 CHECKSUM_SHA256="45f0869febea59dab7efd256fb451c377cbb7947bef386ff0bb44627c31a8d1c"
 LICENSE="MIT"
 COPYRIGHT="Copyright (C) 2006-2015 the Mako authors and contributors"
-REVISION="1"
+REVISION="2"
 
 ARCHITECTURES="arm ppc x86 x86_gcc2 x86_64"
 
@@ -15,6 +15,7 @@ SOURCE_DIR="Mako-$portVersion"
 
 PROVIDES="
 	python_mako = $portVersion
+	cmd:mako_render
 	"
 
 REQUIRES="
diff --git a/dev-python/python_setuptools/python3_setuptools-17.0.recipe b/dev-python/python_setuptools/python3_setuptools-17.0.recipe
new file mode 100644
index 000000000..3ad31203f
--- /dev/null
+++ b/dev-python/python_setuptools/python3_setuptools-17.0.recipe
@@ -0,0 +1,53 @@
+SUMMARY="Easily download, build, install, upgrade, and uninstall Python packages."
+DESCRIPTION="EasyInstall (easy_install) gives you a quick and painless way \
+to install packages remotely by connecting to the cheeseshop or even other \
+websites via HTTP. It is somewhat analogous to the CPAN and PEAR tools for Perl \
+and PHP, respectively. \
+"
+HOMEPAGE="https://pypi.python.org/pypi/setuptools"
+SRC_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-$portVersion.zip"
+CHECKSUM_SHA256="11e77e37c768f77b652003594fb5a0aaa3e4cbb10c07ede2397c9233885b6c7f"
+SOURCE_DIR="setuptools-$portVersion"
+LICENSE="Python"
+COPYRIGHT="2006-2014 Python Packaging Authority"
+REVISION="1"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
+PROVIDES="
+	python3_setuptools = $portVersion
+	"
+
+REQUIRES="
+	haiku
+	cmd:python3
+	"
+
+BUILD_REQUIRES=""
+
+BUILD_PREREQUIRES="
+	haiku_devel
+	cmd:python3
+	cmd:sed
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python3/bin/python3 setup.py build
+}
+
+INSTALL()
+{
+	# GENERIC: all python_setuptools-based installs need this
+	pythonVersion=$(python3 --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation
+	
+	$portPackageLinksDir/cmd~python3/bin/python3 setup.py install \
+		--prefix=$prefix
+
+	# easy_install cannot tolerate not being installed alongside setuptools,
+	# so just delete it.
+	rm $prefix/bin/easy_install
+	rm $prefix/bin/easy_install-3.?
+}