diff --git a/dev-python/pyasn1/pyasn1-0.4.3.recipe b/dev-python/pyasn1/pyasn1-0.4.3.recipe
index d86fc74ca..c07ec95b9 100644
--- a/dev-python/pyasn1/pyasn1-0.4.3.recipe
+++ b/dev-python/pyasn1/pyasn1-0.4.3.recipe
@@ -20,43 +20,83 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku_devel
+	setuptools_python
+	setuptools_python3
+	"
+BUILD_PREREQUIRES="
+	cmd:python
+	cmd:python3
 	"
 
-PYTHON_PACKAGES=(python3)
-PYTHON_VERSIONS=(3.6)
+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
+		installLocation=$prefix/lib/$python/vendor-packages/
+		export PYTHONPATH=$installLocation
+		mkdir -p "$installLocation"
+		$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
-		mkdir -p $installLocation
-		rm -rf build
-		$python setup.py build install \
-			--root=/ --prefix=$prefix
+		export PYTHONPATH=$installLocation
+		mkdir -p "$installLocation"
+		$python setup.py install \
+			--root=/ --prefix="$prefix"
+
+		install -m 755 -d "$dataDir"/licenses
+		install -m 644 -T LICENSE.rst "$dataDir"/licenses/pyasn1.rst
 
 		packageEntries  $pythonPackage \
-			$prefix/lib/python*
+			"$prefix"/lib/$python
 	done
+
+	install -m 755 -d "$dataDir"/licenses "$docDir"
+	install -m 644 -T LICENSE.rst "$dataDir"/licenses/pyasn1.rst
+	install -m 644 -t "$docDir" README.md
 }
 
+TEST()
+{
+	for i in "${!PYTHON_PACKAGES[@]}"; do
+		pythonPackage=${PYTHON_PACKAGES[i]}
+		pythonVersion=${PYTHON_VERSIONS[$i]}
 
+		cd "$sourceDir"-$pythonPackage
+
+		python=python$pythonVersion
+		$python setup.py tests
+	done
+}