--- a/components/lighttpd/Makefile	Tue Apr 04 10:36:17 2017 -0700
+++ b/components/lighttpd/Makefile	Tue Apr 04 16:12:22 2017 -0700
@@ -59,10 +59,10 @@
 CONFIGURE_OPTIONS +=	--with-openssl
 CONFIGURE_OPTIONS +=	--with-pcre
 CONFIGURE_OPTIONS +=	--with-ldap
-ifeq ($(OS_VERSION), 5.12)
+ifeq ($(OS_VERSION), 11.3)
+CONFIGURE_OPTIONS +=	--with-mysql=$(USRDIR)/mysql/5.5/bin/mysql_config
+else
 CONFIGURE_OPTIONS +=	--with-mysql=$(USRDIR)/mysql/5.7/bin/mysql_config
-else
-CONFIGURE_OPTIONS +=	--with-mysql=$(USRDIR)/mysql/5.5/bin/mysql_config
 endif
 CONFIGURE_OPTIONS +=    PCRECONFIG="$(USRBINDIR64)/pcre-config"
 
@@ -72,14 +72,11 @@
 	'-e "/.*/d" '
 
 REQUIRED_PACKAGES += compress/bzip2
-ifeq ($(OS_VERSION), 5.12)
-REQUIRED_PACKAGES += database/mysql-57
-REQUIRED_PACKAGES += database/mysql-57/library
-else
-REQUIRED_PACKAGES += database/mysql-55
-REQUIRED_PACKAGES += database/mysql-55/library
-endif
-$(SOLARIS_11_ONLY)REQUIRED_PACKAGES += library/openldap
+$(SOLARIS_11_3_ONLY)REQUIRED_PACKAGES += database/mysql-55
+$(SOLARIS_11_3_ONLY)REQUIRED_PACKAGES += database/mysql-55/library
+$(SOLARIS_11_4_ONLY)REQUIRED_PACKAGES += database/mysql-57
+$(SOLARIS_11_4_ONLY)REQUIRED_PACKAGES += database/mysql-57/library
+$(SOLARIS_11_3_ONLY)REQUIRED_PACKAGES += library/openldap
 REQUIRED_PACKAGES += library/pcre
 REQUIRED_PACKAGES += library/security/openssl
 REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140