diff --git a/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild
--- a/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://vsftpd.beasts.org/users/c
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 IUSE="caps logrotate pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( sys-libs/libcap )
@@ -39,22 +39,22 @@ src_unpack() {
 	# Configure vsftpd build defaults
 	echo "#!/bin/sh" > vsf_findlibs.sh
 	if use tcpd; then
-	    echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	    echo "echo \"-lwrap\" \"-lnsl\"" >> vsf_findlibs.sh
+		echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
+		echo "echo \"-lwrap\" \"-lnsl\"" >> vsf_findlibs.sh
 	fi
 	if use ssl; then
-	    echo "#define VSF_BUILD_SSL" >> builddefs.h
-	    echo "echo \"-lssl -lcrypto\"" >> vsf_findlibs.sh
+		echo "#define VSF_BUILD_SSL" >> builddefs.h
+		echo "echo \"-lssl -lcrypto\"" >> vsf_findlibs.sh
 	fi
 	if use pam; then
-	    echo "\"-lpam\"" >> vsf_findlibs.sh
+		echo "\"-lpam\"" >> vsf_findlibs.sh
 	else
-	    echo "#undef VSF_BUILD_PAM" >> builddefs.h
+		echo "#undef VSF_BUILD_PAM" >> builddefs.h
 	fi
 
 	# Ensure that we don't link against libcap unless asked
 	if use caps ; then
-	    echo "echo \"-lcap\"" >> vsf_findlibs.sh
+		echo "echo \"-lcap\"" >> vsf_findlibs.sh
 	else
 		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
 		sed -i '/libcap/ d' vsf_findlibs.sh