diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index e441bca..cbae5d3 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -3,6 +3,5 @@ AUX samba-conf 1291 RMD160 326fb4beee8105d839d23e37f4989d7e332c996b SHA1 af7cd69
 AUX samba-init 1133 RMD160 77a084e8f78665af0233f19dc9c4a49693360da1 SHA1 09d7f1d676856289b61e890396a9976e2ccc794a SHA256 3b41d16daf02f9a1ab12e62c4c915f58e7801c07be48e2a94086eb288bb86aad
 AUX samba-xinetd 286 RMD160 c90bd8518082eb4c182d5f7bd223a76f8e3c7fab SHA1 b250c5ca539187d8b481bcfb6ea3a915d7e8b26b SHA256 964d06dc33beff38978a8f03cd12b05c33d8258ed73aa9ffbf137fe226de25b8
 DIST samba-4.0.0alpha7.tar.gz 11927771 RMD160 551aface24e04e8b5665c1d2e12ec8bc7a725d0f SHA1 f59bedd40e0fd5a85e31ea4a06e8a4a874c6c9b7 SHA256 744d97ad7fc964efa27f02bdc4f93b533269e4e5e27639035ae80942510c743e
-DIST samba-vscan-0.3.6c-beta5.tar.gz 248183 RMD160 6929c30b57e342c4bdf6a6b432fbe41c2ac70a74 SHA1 9e1b37225246ff2f19e37aceb97a680afc82cdda SHA256 bfe910d54add8dcb87d5babdf50127a6dcf079e0e90ad9947b4cbfdbe3e3037d
-EBUILD samba-4.0.0_alpha7.ebuild 6796 RMD160 82a113e613c6d26a27ab56b60c92afe04128a3aa SHA1 863794c7cd1373993559809111e2426f860741ff SHA256 f96f5d391b1706e54bf35f424a3b8306df2eee8f7d4d6c93953c803f0b5954de
+EBUILD samba-4.0.0_alpha7.ebuild 5210 RMD160 230134206685605283b1b931f3bddcb56255adc8 SHA1 9c83ca3064dce21c883b922d8bad8dd71183477b SHA256 d1b13ab9cb11d7d61cb25b4d90dbf388e73bfd230309b46c9076a735ae359ee7
 MISC samba-9999.ebuild.old_svn 8339 RMD160 863bcbf1d8ebec56ae70eb428d1c99d1567ff2e3 SHA1 dfbcadc3241baaac7c9aea62d72ecae5924a0d3d SHA256 132bba6308140f951bae6d5e7860e40a212de58708ff3a7053045d5ba0656469
diff --git a/net-fs/samba/samba-4.0.0_alpha7.ebuild b/net-fs/samba/samba-4.0.0_alpha7.ebuild
index 16b6221..c22a095 100644
--- a/net-fs/samba/samba-4.0.0_alpha7.ebuild
+++ b/net-fs/samba/samba-4.0.0_alpha7.ebuild
@@ -4,20 +4,19 @@
 
 inherit autotools eutils pam python multilib versionator confutils
 
-VSCAN_P="samba-vscan-0.3.6c-beta5"
 MY_P=${PN}-${PV/_/}
 
 DESCRIPTION="A suite of SMB and CIFS client/server programs for UNIX"
 HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/samba4/${MY_P}.tar.gz
-	oav? ( http://www.openantivirus.org/download/${VSCAN_P}.tar.gz )"
-LICENSE="GPL-3 oav? ( GPL-2 LGPL-2.1 )"
+SRC_URI="mirror://samba/samba4/${MY_P}.tar.gz"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="acl attr caps debug developer doc dso examples gnutls ldap
-	oav python readline swat"
+	readline swat"
 
 RDEPEND="sys-libs/e2fsprogs-libs
+	dev-lang/python
 	acl?       ( sys-apps/acl )
 	attr?      ( sys-apps/attr )
 	caps?      ( sys-libs/libcap )
@@ -60,6 +59,8 @@ src_compile() {
 			Makefile.in || die "sed failed"
 	fi
 
+	use doc && myconf="${myconf} --docdir=/usr/share/doc/${PF}"
+
 	econf \
 		--sysconfdir=/etc/samba \
 		--localstatedir=/var \
@@ -79,26 +80,6 @@ src_compile() {
 
 	emake proto || die "emake proto failed"
 	emake everything || die "emake everything failed"
-
-	if use python ; then
-		emake python_ext || die "emake python_ext failed"
-	fi
-
-	if use oav ; then
-		# maintainer-info:
-		# - there are no known releases of mks or kavdc,
-		#   setting to builtin to disable auto-detection
-		cd "${WORKDIR}/${VSCAN_P}"
-		econf \
-			--with-samba-source="${S}/source4" \
-			--with-libmksd-builtin \
-			--with-libkavdc-builtin \
-			--without-symantec \
-			--with-filetype \
-			--with-fileregexp \
-			$(use_enable debug)
-		emake || die "emake oav plugins failed"
-	fi
 }
 
 src_test() {
@@ -120,11 +101,9 @@ src_install() {
 	# remove .old stuff from /usr/bin:
 	rm -f "${D}"/usr/bin/*.old
 
-	if use python ; then
-		emake DESTDIR="${D}" python_install || die "emake installpython failed"
-		# We're doing that manually
-		find "${D}/usr/$(get_libdir)/python${PYVER}/site-packages" -iname "*.pyc" -delete
-	fi
+	emake DESTDIR="${D}" python_install || die "emake installpython failed"
+	# We're doing that manually
+	find "${D}/usr/$(get_libdir)/python${PYVER}/site-packages" -iname "*.pyc" -delete
 
 	# General config files
 	insinto /etc/samba
@@ -158,41 +137,12 @@ src_install() {
 	dodoc "${CONFDIR}/nsswitch.conf-wins"
 
 	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${S}/examples/"
-		find "${D}/usr/share/doc/${PF}" -type d -print0 | xargs -0 chmod 755
-		find "${D}/usr/share/doc/${PF}/examples" ! -type d -print0 | xargs -0 chmod 644
-		if use python ; then
-			insinto /usr/share/doc/${PF}/python
-			doins -r "${S}/source/python/examples"
-		fi
+		insinto /usr/share/doc/${PF}/python
+		doins -r "${S}/scripting/python/examples"
 	fi
 
 	insinto /usr/share/${PN}/setup
 	doins -r setup
-
-	if ! use doc ; then
-		if ! use swat ; then
-			rm -rf "${D}/usr/share/doc/${PF}/swat"
-		else
-			rm -rf "${D}/usr/share/doc/${PF}/swat/help"/{guide,howto,devel}
-			rm -rf "${D}/usr/share/doc/${PF}/swat/using_samba"
-		fi
-	else
-		cd "${S}/docs"
-		insinto /usr/share/doc/${PF}
-		doins *.pdf
-		doins -r registry
-		dohtml -r htmldocs/*
-	fi
-
-	if use oav ; then
-		cd "${WORKDIR}/${VSCAN_P}"
-		emake DESTDIR="${D}" install || die "emake install oav plugins failed"
-		docinto samba-vscan
-		dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README TODO
-		find . -iname "*.conf" -print0 | xargs -0 dodoc
-	fi
 }
 
 pkg_preinst() {
@@ -211,10 +161,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:"
@@ -225,11 +173,6 @@ pkg_postinst() {
 	elog "Samba 4.0."
 	elog "You may try to install net-fs/mount-cifs at your own risk."
 
-	if use oav ; then
-		elog "The configure snippets for various antivirus plugins are available here:"
-		elog "  /usr/share/doc/${PF}/samba-vscan"
-	fi
-
 	elog "The provision helper scripts for setting up LDAP backends, etc. are installed"
 	elog "/usr/share/samba/setup."