diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index a473dc8d..54937a71 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1 +1 @@
-DIST lighttpd-1.4.42.tar.xz 652140 SHA256 b2c9069ed0bade9362c27b469a9b884641786aea1c3d686f9fd9f01d15e2a15f SHA512 eb43a53f1fe7a115d0cf60ed8b79a22472a4fef939937401a475bdfd7244e53efa3aae1f66cd709989e77064aadd40004455b167ea3c4efc07ced261c18bd773 WHIRLPOOL 2886d02c477ffe4a36a4d33656c69c34df65b563e6ee81dad7be957ab472197fb91087e1e494b23f4e83a35939f102494140d34737fd280692503e54b3676fe7
+DIST lighttpd-1.4.43.tar.xz 656248 SHA256 fe0c4a06dd2408a83ee7a2bfedc45e09597f3313cbda82485507573ae8fa948a SHA512 131e1d96276a6b5ca597bae9ff78df20bfc9907e9c832b6fdea8b86d493764a5dce24cfc3bb2e931755af18a26b0e8c6fd21714fca7d6c6a402c85f7fe4a588a WHIRLPOOL 90110b2b06c3579c435cd5a0539371bba8f0b70f7c1ee344ed98b9a55d6dd07c38d11430589b11257385815183bf208aed3c115554c6822056a7cedf5047341c
diff --git a/www-servers/lighttpd/lighttpd-1.4.42.ebuild b/www-servers/lighttpd/lighttpd-1.4.43.ebuild
similarity index 95%
rename from www-servers/lighttpd/lighttpd-1.4.42.ebuild
rename to www-servers/lighttpd/lighttpd-1.4.43.ebuild
index 2c3832eb..b68518bf 100644
--- a/www-servers/lighttpd/lighttpd-1.4.42.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.43.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
-inherit base autotools eutils readme.gentoo user systemd
+EAPI="6"
+inherit autotools eutils readme.gentoo-r1 user systemd
 
 DESCRIPTION="Lightweight high-performance web server"
 HOMEPAGE="http://www.lighttpd.net/"
@@ -12,7 +12,7 @@ SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcache mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
+IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
 
 REQUIRED_USE="kerberos? ( ssl !libressl )"
 
@@ -23,7 +23,7 @@ CDEPEND="
 	ldap?     ( >=net-nds/openldap-2.1.26 )
 	libev?    ( >=dev-libs/libev-4.01 )
 	lua?      ( >=dev-lang/lua-5.1:= )
-	memcache? ( dev-libs/libmemcache )
+	memcached? ( dev-libs/libmemcache )
 	mysql?    ( >=virtual/mysql-4.0 )
 	pcre?     ( >=dev-libs/libpcre-3.1 )
 	php?      ( dev-lang/php:*[cgi] )
@@ -38,7 +38,7 @@ CDEPEND="
 		sys-fs/e2fsprogs
 	)
 	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? (	>=sys-libs/zlib-1.1 )"
+	zlib? ( >=sys-libs/zlib-1.1 )"
 
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
@@ -107,7 +107,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	base_src_prepare
+	default
 	#dev-python/docutils installs rst2html.py not rst2html
 	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
 		die "sed doc/Makefile.am failed"
@@ -122,11 +122,11 @@ src_configure() {
 		$(use_with bzip2) \
 		$(use_with fam) \
 		$(use_with gdbm) \
-		$(use_with kerberos kerberos5) \
+		$(use_with kerberos krb5) \
 		$(use_with ldap) \
 		$(use_with libev) \
 		$(use_with lua) \
-		$(use_with memcache) \
+		$(use_with memcached) \
 		$(use_with mysql) \
 		$(use_with pcre) \
 		$(use_with ssl openssl) \