diff --git a/opera-12.16_p1860.ebuild b/opera-12.16_p1860.ebuild
index 8e02fc2..b29f6ca 100644
--- a/opera-12.16_p1860.ebuild
+++ b/opera-12.16_p1860.ebuild
@@ -10,8 +10,8 @@ HOMEPAGE="http://www.opera.com/"
 
 SLOT="0"
 LICENSE="OPERA-12 LGPL-2 LGPL-3"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk kde +gstreamer multilib"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="elibc_FreeBSD gtk kde kernel_linux +gstreamer multilib"
 
 O_V="$(get_version_component_range 1-2)" # Version, i.e. 11.00
 O_B="$(get_version_component_range 3)"   # Build number, i.e. 1156
@@ -38,6 +38,7 @@ if [[ "pre${O_B/pre/}" = "${O_B}" ]]; then	# snapshot: _pre
 
 	SRC_URI="
 		amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
+		amd64-fbsd? ( ${O_U}${O_D}/${O_P}.amd64.freebsd.tar.xz )
 		x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
 		x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
 	"
@@ -48,6 +49,7 @@ else							# release: _p
 
 	SRC_URI="
 		amd64? ( ${O_U}linux/${O_D}/${O_P}.x86_64.linux.tar.xz )
+		amd64-fbsd? ( ${O_U}unix/${O_D}/${O_P}.amd64.freebsd.tar.xz )
 		x86? ( ${O_U}linux/${O_D}/${O_P}.i386.linux.tar.xz )
 		x86-fbsd? ( ${O_U}unix/${O_D}/${O_P}.i386.freebsd.tar.xz )
 	"
@@ -85,7 +87,7 @@ GSTRDEPEND="
 RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
-	sys-apps/util-linux
+	kernel_linux? ( sys-apps/util-linux )
 	sys-libs/zlib
 	virtual/opengl
 	x11-libs/libICE
@@ -182,27 +184,29 @@ src_prepare() {
 		>> ${PN}
 	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
 
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
+	# Change libfreetype.so.9 to libfreetype.so.6 for Gentoo/FreeBSD, bug #477594
 	if use elibc_FreeBSD; then
-		scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
+		scanelf -qR -N libfreetype.so.9 -F "#N" lib/${PN}/ | \
 		while read i; do
-			if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
+			if [[ $(strings "$i" | fgrep -c libfreetype.so.9) -ne 1 ]];
 			then
-				export SANITY_CHECK_LIBZ_FAILED=1
+				export SANITY_CHECK_LIBFREETYPE_FAILED=1
 				break
 			fi
 			sed -i \
 				"$i" \
-				-e 's/libz\.so\.3/libz.so.1/g'
+				-e 's/libfreetype\.so\.9/libfreetype.so.6/g'
 		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
+		[[ "$SANITY_CHECK_LIBFREETYPE_FAILED" = "1" ]] && die
 	fi
 }
 
 src_install() {
 	# We install into usr instead of opt as Opera does not support the latter
 	dodir /usr
-	rm lib/${PN}/opera_autoupdatechecker || die
+	if ! use elibc_FreeBSD; then
+		rm lib/${PN}/opera_autoupdatechecker || die
+	fi
 	mv lib/ "${D}/${OPREFIX}" || die
 	mv share/ "${D}/usr/" || die