--- openssh-5.9_p1-r4.ebuild.orig	2012-03-15 12:06:21.000000000 +0900
+++ openssh-5.9_p1-r4.ebuild	2012-03-19 21:46:36.094897841 +0900
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-5.9_p1-r4.ebuild,v 1.1 2012/03/15 03:06:21 vapier Exp $
 
 EAPI="2"
-inherit eutils flag-o-matic multilib autotools pam systemd
+inherit eutils flag-o-matic multilib autotools pam systemd versionator
 
 # Make it more portable between straight releases
 # and _p? releases.
@@ -149,11 +149,18 @@
 }
 
 src_configure() {
+	local myconf
 	addwrite /dev/ptmx
 	addpredict /etc/skey/skeykeys #skey configure code triggers this
 
 	use static && append-ldflags -static
 
+	# Special settings for Gentoo/FreeBSD 9.0 or later (see bug #391011)
+	if use elibc_FreeBSD && version_is_at_least 9.0 "$(uname -r|sed 's/\(.\..\).*/\1/')" ; then
+		myconf="${myconf} --disable-utmp --disable-wtmp --disable-wtmpx"
+		append-ldflags -lutil
+	fi
+
 	econf \
 		--with-ldflags="${LDFLAGS}" \
 		--disable-strip \
@@ -170,7 +177,8 @@
 		$(use_with libedit) \
 		$(use_with selinux) \
 		$(use_with skey) \
-		$(use_with tcpd tcp-wrappers)
+		$(use_with tcpd tcp-wrappers) \
+		${myconf}
 }
 
 src_install() {