diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9025f70..7eacf74 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,5 +1,5 @@
 AUX config-4.0/samba-conf 69 RMD160 2b5f0af9d9cdb3659d2975884aee6e2557e76319 SHA1 833a5d2c0d6eaa72991adb01873054c20cfe666f SHA256 41d6a03e7cf1d1351c49bf4918a5618d0747817d2c3235fa2ddf1e5f2f1c9b84
 AUX config-4.0/samba-init 587 RMD160 fd123fead110f89dceedae956210b4a2b1f7ffbf SHA1 ed28ed0221412c82f3fe9d3897f438a31723571c SHA256 efa8b8d8d8648c301ec86f6e715322cb4c5ac772fd412f7d56031398fa2ef1ec
 DIST samba-4.0.0alpha7.tar.gz 11927771 RMD160 551aface24e04e8b5665c1d2e12ec8bc7a725d0f SHA1 f59bedd40e0fd5a85e31ea4a06e8a4a874c6c9b7 SHA256 744d97ad7fc964efa27f02bdc4f93b533269e4e5e27639035ae80942510c743e
-EBUILD samba-4.0.0_alpha7.ebuild 3888 RMD160 a543d891ead94981677d234ec225579383689eb9 SHA1 57af05700e1523f20a91f76faa858eb2bd5845fe SHA256 ba8447ce2f0cb084d463f7a9e526c0808a149060d7dc9bf0e2a139cd49033c15
+EBUILD samba-4.0.0_alpha7.ebuild 4044 RMD160 31a5bc44df7b12fa42bce31c0307b290d8475d4d SHA1 3a83485ef46ededf800d6a1570c1d6fd6d3492be SHA256 f87f46413013f7e52f216dd499126dd5552b74124cda073efba673f45bbb77f7
 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 a675e2b..9896fc3 100644
--- a/net-fs/samba/samba-4.0.0_alpha7.ebuild
+++ b/net-fs/samba/samba-4.0.0_alpha7.ebuild
@@ -57,7 +57,7 @@ src_compile() {
 	use doc && myconf="${myconf} --docdir=/usr/share/doc/${PF}"
 
 	econf \
-		--sysconfdir=/etc \
+		--sysconfdir=/etc/samba \
 		--localstatedir=/var \
 		--with-piddir=/var/run/samba \
 		--with-lockdir=/var/cache/samba \
@@ -87,6 +87,10 @@ src_install() {
 
 	emake DESTDIR="${D}" install || die "emake install failed"
 
+	# For some reason, make install creates a SYSCONFDIR/samba
+	# that is never used. To avoid confusion, we remove it.
+	rm -rf "${D}"/etc/samba/samba
+
 	newinitd "${CONFDIR}/samba-init" samba
 	newconfd "${CONFDIR}/samba-conf" samba
 
@@ -106,6 +110,7 @@ src_install() {
 
 	insinto /usr/share/${PN}/setup
 	doins -r setup
+
 }
 
 pkg_preinst() {