diff --git a/dev-libs/pybind11/pybind11-2.4.3.recipe b/dev-python/pybind11/pybind11-2.6.2.recipe
similarity index 58%
rename from dev-libs/pybind11/pybind11-2.4.3.recipe
rename to dev-python/pybind11/pybind11-2.6.2.recipe
index e8fc84059..4efb49636 100644
--- a/dev-libs/pybind11/pybind11-2.4.3.recipe
+++ b/dev-python/pybind11/pybind11-2.6.2.recipe
@@ -10,33 +10,40 @@ COPYRIGHT="2015-2019 Wenzel Jakob"
 LICENSE="BSD (2-clause)"
 REVISION="1"
 SOURCE_URI="https://github.com/pybind/pybind11/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="1eed57bc6863190e35637290f97a20c81cfe4d9090ac0a24f3bbf08f265eb71d"
+CHECKSUM_SHA256="8ff2fff22df038f5cd02cea8af56622bc67f5b64534f1b83b9f133b8366acff2"
 SOURCE_FILENAME="pybind11-v$portVersion.tar.gz"
 
-ARCHITECTURES="any"
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	$portName = $portVersion
+	pybind11$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
 
-PYTHON_PACKAGES=(python python36 python3)
-PYTHON_VERSIONS=(2.7 3.6 3.7)
+PYTHON_PACKAGES=(python3 python38 python39)
+PYTHON_VERSIONS=(3.7 3.8 3.9)
 for i in "${!PYTHON_PACKAGES[@]}"; do
 pythonPackage=${PYTHON_PACKAGES[i]}
 pythonVersion=${PYTHON_VERSIONS[$i]}
 eval "PROVIDES_${pythonPackage}=\"\
-	${portName}_$pythonPackage = $portVersion\
+	${portName}_$pythonPackage = $portVersion\n\
+	cmd:pybind11_config$pythonVersion\n\
 	\"; \
 REQUIRES_$pythonPackage=\"\
 	haiku\n\
 	cmd:python$pythonVersion\
 	\""
 BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_$pythonPackage"
+	haiku${secondaryArchSuffix}_devel
+	setuptools_$pythonPackage
+	devel:eigen$secondaryArchSuffix"
 BUILD_PREREQUIRES="$BUILD_PREREQUIRES
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	cmd:python$pythonVersion"
 done
 
@@ -49,13 +56,26 @@ INSTALL()
 		python=python$pythonVersion
 		installLocation=$prefix/lib/$python/vendor-packages/
 		export PYTHONPATH=$installLocation:$PYTHONPATH
-		mkdir -p $installLocation
+		mkdir -p $installLocation #$prefix/lib/cmake
 		rm -rf build
 		$python setup.py build install \
 			--root=/ --prefix=$prefix
+		mv $prefix/bin/pybind11-config $prefix/bin/pybind11-config$pythonVersion
+
+#		Not sure we want to run cmake build
+#		this will install the headers and cmake files double
+#		cmake -B build $cmakeDirArgs \
+#			-DCMAKE_BUILD_TYPE=None \
+#			-DPYBIND11_PYTHON_VERSION=$pythonVersion \
+#			-DPYBIND11_TEST=OFF \
+#			-DUSE_PYTHON_INCLUDE_DIR=OFF
+#		make -C build install
+
+#		mv $dataDir/cmake/pybind11 $prefix/lib/cmake
+#		rm -rf $dataDir
 
 		packageEntries  $pythonPackage \
-			$developDir \
+			$prefix/bin \
 			$prefix/lib/python*
 	done
 }