diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 4bc2521..46dcc3b 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -10,4 +10,4 @@ AUX config/system-auth-winbind 873 RMD160 7392d93abc16dd5e1caaebe8bbe3aa786b1122
 DIST samba-4.0.0alpha1.tar.gz 9501244 RMD160 fc0020bd334a073cd78d46486c0e9aad3947a9b9 SHA1 5c1141fd68804b0b8ede261c6d988fee5dbf0d94 SHA256 5f1673443c6b58b796c60579c89a84d838e030b92bb069f86581f6d6a351f713
 DIST samba-4.0.0alpha3.tar.gz 9994864 RMD160 3cccc660b069a1ab68ab09b904b442c1d1d9c95a SHA1 82d7c4da077d73e3ba44187d380a9829d257cdac SHA256 9fefacec174c279da73bdaa08f61765bc49612cc99a7727fd7320e73335040e9
 EBUILD samba-4.0.0_alpha1.ebuild 8745 RMD160 e489002c1e91fa813eec085323807af57a333340 SHA1 21576b7e13568ac1240dba13ff70a6fc64524e8f SHA256 a09d2a2f8414f292c9eb78965562e5b1cc47901913dc4109bbd80447b49b98f3
-EBUILD samba-4.0.0_alpha3.ebuild 8342 RMD160 4b8c9968ac4aeba063d037df9b0c1f9e5f5c5eb0 SHA1 27f0498b8ffc394886ac3edf43a34dfb157bf6f3 SHA256 077102622102410dbbc244ea0b15d8a0bd3f2a33a9ef79c67aa5e4d65456ccaf
+EBUILD samba-4.0.0_alpha3.ebuild 8706 RMD160 e3621341c52e2846e4be0395a737ae61a8798c8d SHA1 0e1c029a7be2dfbaa23c543f5fe674bac590807a SHA256 d3e99b2a9bfee8e8d821c33de3b299b801b4b18ba746bb0f9a5afff30563e396
diff --git a/net-fs/samba/samba-4.0.0_alpha3.ebuild b/net-fs/samba/samba-4.0.0_alpha3.ebuild
index c1b7f8c..92b2256 100644
--- a/net-fs/samba/samba-4.0.0_alpha3.ebuild
+++ b/net-fs/samba/samba-4.0.0_alpha3.ebuild
@@ -105,6 +105,7 @@ src_compile() {
 		--without-spinlocks \
 		--enable-socket-wrapper \
 		--with-cifsmount=no \
+		--with-python \
 		$(use_with acl acl-support) \
 		$(use_with async aio-support) \
 		$(use_with automount) \
@@ -134,8 +135,16 @@ src_install() {
 
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	# Extra rpctorture progs
-	local extra_bins="rpctorture"
+	python_version
+	insinto "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/samba
+	doins scripting/python/samba/*.py
+	insinto "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/samba/tests
+	doins scripting/python/samba/tests/*.py
+	insinto "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/samba/torture
+	doins scripting/python/samba/torture/*.py
+
+	# Extra rpctorture/python progs
+	local extra_bins="rpctorture smbpython"
 	for i in ${extra_bins} ; do
 		[[ -x "${S}/bin/${i}" ]] && dobin "${S}/bin/${i}"
 	done
@@ -260,10 +269,8 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if use python ; then
-		python_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/samba
-	fi
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/samba
 
 	if use swat ; then
 		einfo "swat must be enabled by xinetd:"