diff --git a/www-servers/lighttpd/lighttpd-1.4.35.recipe b/www-servers/lighttpd/lighttpd-1.4.39.recipe
similarity index 89%
rename from www-servers/lighttpd/lighttpd-1.4.35.recipe
rename to www-servers/lighttpd/lighttpd-1.4.39.recipe
index 157914fc7..22c613f3d 100644
--- a/www-servers/lighttpd/lighttpd-1.4.35.recipe
+++ b/www-servers/lighttpd/lighttpd-1.4.39.recipe
@@ -6,15 +6,15 @@ With a small memory footprint compared to other web-servers, effective \
 management of the cpu-load, and advanced feature set (FastCGI, SCGI, Auth, \
 Output-Compression, URL-Rewriting and many more) lighttpd is the perfect \
 solution for every server that is suffering load problems."
-HOMEPAGE="http://www.lighttpd.net/"
-COPYRIGHT="2003-2014 Jan Kneschke"
+HOMEPAGE="https://www.lighttpd.net/"
+COPYRIGHT="2003-2016 Jan Kneschke"
 LICENSE="BSD (3-clause)"
-REVISION="3"
-SOURCE_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.35.tar.gz"
-CHECKSUM_SHA256="62c23de053fd82e1bf64f204cb6c6e44ba3c16c01ff1e09da680d982802ef1cc"
-PATCHES="lighttpd-1.4.35.patchset"
+REVISION="1"
+SOURCE_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$portVersion.tar.gz"
+CHECKSUM_SHA256="bc5f910f78b8cbae3e8fe1a1d8558259f09dbe50dd3907db771404bfab27bb2e"
+PATCHES="lighttpd-$portVersion.patch"
 
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64 ?arm ?ppc"
 
 PROVIDES="
 	lighttpd = $portVersion
diff --git a/www-servers/lighttpd/patches/lighttpd-1.4.35.patchset b/www-servers/lighttpd/patches/lighttpd-1.4.35.patchset
deleted file mode 100644
index 67d3fe76d..000000000
--- a/www-servers/lighttpd/patches/lighttpd-1.4.35.patchset
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2f4d3088b5d2984a9ead2d24d4d9997068a6ccca Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@gmail.com>
-Date: Fri, 17 Oct 2014 11:03:53 +0200
-Subject: build fixes.
-
-
-diff --git a/configure.ac b/configure.ac
-index 682023b..3efa39b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -613,7 +613,7 @@ AM_CONDITIONAL(CHECK_WITH_FASTCGI, test "x$fastcgi_found" = xyes)
- 
- dnl check for extra compiler options (warning options)
- if test "${GCC}" = "yes"; then
--    CFLAGS="${CFLAGS} -Wall -W -Wshadow -pedantic -std=gnu99"
-+    CFLAGS="${CFLAGS} -Wall -W -Wshadow -pedantic -std=gnu9x"
- fi
- 
- AC_ARG_ENABLE(extra-warnings,
-diff --git a/src/network.c b/src/network.c
-index ebde43b..d5e843d 100644
---- a/src/network.c
-+++ b/src/network.c
-@@ -356,15 +356,15 @@ static int network_server_init(server *srv, buffer *host_token, specific_config
- 				goto error_free_socket;
- 			}
- 			memcpy(srv_socket->addr.un.sun_path, host, hostlen);
--		}
--		srv_socket->addr.un.sun_family = AF_UNIX;
-+			srv_socket->addr.un.sun_family = AF_UNIX;
- 
- #ifdef SUN_LEN
--		addr_len = SUN_LEN(&srv_socket->addr.un);
-+			addr_len = SUN_LEN(&srv_socket->addr.un);
- #else
--		/* stevens says: */
--		addr_len = hostlen + sizeof(srv_socket->addr.un.sun_family);
-+			/* stevens says: */
-+			addr_len = hostlen + sizeof(srv_socket->addr.un.sun_family);
- #endif
-+		}
- 
- 		/* check if the socket exists and try to connect to it. */
- 		if (-1 != (fd = connect(srv_socket->fd, (struct sockaddr *) &(srv_socket->addr), addr_len))) {
--- 
-1.8.3.4
-
diff --git a/www-servers/lighttpd/patches/lighttpd-1.4.39.patch b/www-servers/lighttpd/patches/lighttpd-1.4.39.patch
new file mode 100644
index 000000000..0f5db7e4a
--- /dev/null
+++ b/www-servers/lighttpd/patches/lighttpd-1.4.39.patch
@@ -0,0 +1,11 @@
+--- lighttpd-1.4.39/configure.ac	2015-12-05 14:17:22.000000000 +0000
++++ lighttpd-1.4.39-haiku/configure.ac
+@@ -690,7 +690,7 @@ AM_CONDITIONAL(CHECK_WITH_FASTCGI, test
+ dnl check for extra compiler options (warning options)
+ if test "${GCC}" = "yes"; then
+   TRY_CFLAGS([-Wall -W -Wshadow -pedantic])
+-  TRY_CFLAGS([-std=gnu99])
++  TRY_CFLAGS([-std=gnu9x])
+ fi
+ 
+ AC_ARG_ENABLE(extra-warnings,