--- autofs-5.0.6-r5.ebuild
+++ autofs-5.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.6-r5.ebuild,v 1.1 2011/12/17 03:45:15 pva Exp $
 
@@ -15,14 +15,14 @@ DESCRIPTION="Kernel based automounter"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="hesiod ldap sasl"
+IUSE="hesiod ldap mount-locking sasl"
 
 # USE="sasl" adds SASL support to the LDAP module which will not be build. If
 # SASL support should be available, please add "ldap" to the USE flags.
@@ -48,7 +48,7 @@ src_prepare() {
 	#    #154797: Respect CC and CFLAGS
 	#    #253412: Respect LDFLAGS
 	#    #247969: Link order for --as-needed
-	epatch "${FILESDIR}"/${P}-respect-user-flags-and-fix-asneeded-r2.patch
+	epatch "${FILESDIR}"/${PN}-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch
 
 	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5371
 	epatch "${FILESDIR}"/${PN}-5.0.5-fix-install-deadlink.patch
@@ -61,7 +61,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
 
 	# https://bugs.gentoo.org/show_bug.cgi?id=381315
-	epatch "${FILESDIR}"/${P}-revert-ldap.patch
+	epatch "${FILESDIR}"/${PN}-5.0.6-revert-ldap.patch
 	eautoreconf
 }
 
@@ -81,6 +81,7 @@ src_configure() {
 		$(use_with ldap openldap) \
 		$(use_with sasl) \
 		$(use_with hesiod) \
+		$(use_enable mount-locking) \
 		--enable-ignore-busy
 }