diff --git a/dev-db/lmdb/lmdb-9999.ebuild b/dev-db/lmdb/lmdb-9999.ebuild
index cd04dc1..f588f87 100644
--- a/dev-db/lmdb/lmdb-9999.ebuild
+++ b/dev-db/lmdb/lmdb-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit toolchain-funcs
+EAPI=6
+inherit toolchain-funcs flag-o-matic
 
 if [[ ${PV} = "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/LMDB/lmdb.git"
@@ -11,14 +11,14 @@ if [[ ${PV} = "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
 HOMEPAGE="http://symas.com/mdb/"
 
 LICENSE="OPENLDAP"
-SLOT="0/0.9.18"
+SLOT="0/0.9.19"
 IUSE="static-libs"
 
 DEPEND=""
@@ -35,10 +35,14 @@ src_prepare() {
 		-e "/^libdir/s!lib\$!$(get_libdir)!" \
 		-e "s!shared!shared -Wl,-soname,liblmdb.so.0!" \
 		"${S}/Makefile" || die
+	eapply_user
 }
 
 src_configure() {
-	:
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# ensure sigwait has a second sig argument
+		append-cppflags -D_POSIX_PTHREAD_SEMANTICS
+	fi
 }
 
 src_compile() {