diff --git a/dev-libs/libconfig/Manifest b/dev-libs/libconfig/Manifest
new file mode 100644
index 0000000..e753ae7
--- /dev/null
+++ b/dev-libs/libconfig/Manifest
@@ -0,0 +1 @@
+DIST libconfig-1.5.tar.gz 644432 SHA256 e31daa390d8e4461c8830512fe2e13ba1a3d6a02a2305a02429eec61e68703f6 SHA512 16bead52ee8c880b25fd1ee6fa83c115dc51830f2f7954389bd8b72cc0e6fc05fc63fe415bd929851894a9f3a1127d51cfc4223149514246e9566305556b7bcd WHIRLPOOL ef3718b1ec4485202d1fd03db035419b6c0179e4c4eb47e74ff93b467677c4f53cf9d70d5eb7aa6230dab7a4115e5fae0fc4ed191f1bfc6d0c3c252ee5d90944
diff --git a/dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch b/dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch
new file mode 100644
index 0000000..fe7c2cc
--- /dev/null
+++ b/dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch
@@ -0,0 +1,16 @@
+--- a/libconfig-1.4.9/tests/Makefile.am
++++ b/libconfig-1.4.9/tests/Makefile.am
+@@ -3,10 +3,10 @@
+ 
+ libconfig_tests_SOURCES = tests.c
+ 
+-libconfig_tests_CPPFLAGS = -I../tinytest -I../lib
++libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I$(top_srcdir)/lib
+ 
+-libconfig_tests_LDADD = -L../tinytest -ltinytest \
+-	-L../lib/.libs -lconfig
++libconfig_tests_LDADD = -L$(top_builddir)/tinytest -ltinytest \
++	-L$(top_builddir)/lib/.libs -lconfig
+ 
+ 
+ EXTRA_DIST = \
diff --git a/dev-libs/libconfig/files/libconfig-1.5-out-of-source-build.patch b/dev-libs/libconfig/files/libconfig-1.5-out-of-source-build.patch
new file mode 100644
index 0000000..d109b60
--- /dev/null
+++ b/dev-libs/libconfig/files/libconfig-1.5-out-of-source-build.patch
@@ -0,0 +1,11 @@
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -3,7 +3,7 @@
+ 
+ libconfig_tests_SOURCES = tests.c
+ 
+-libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I../lib
++libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I$(top_srcdir)/lib
+ 
+ libconfig_tests_LDADD = -L$(top_builddir)/tinytest -ltinytest \
+ 	-L$(top_builddir)/lib/.libs -lconfig
diff --git a/dev-libs/libconfig/libconfig-1.5.ebuild b/dev-libs/libconfig/libconfig-1.5.ebuild
new file mode 100644
index 0000000..6b8af5e
--- /dev/null
+++ b/dev-libs/libconfig/libconfig-1.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.5.ebuild,v 1.2 2015/05/26 10:08:29 mgorny Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="1"
+inherit eutils autotools-multilib
+
+DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files"
+HOMEPAGE="http://www.hyperrealm.com/libconfig/libconfig.html"
+SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="*"
+IUSE="+cxx examples static-libs"
+
+DEPEND="
+	sys-devel/libtool
+	sys-devel/bison"
+
+PATCHES=( "${FILESDIR}/${PN}-1.5-out-of-source-build.patch" )
+
+src_prepare() {
+	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable cxx)
+		--disable-examples
+	)
+	autotools-utils_src_configure
+}
+
+multilib_src_test() {
+	# It responds to check but that does not work as intended
+	emake test
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+
+	if use examples; then
+		find examples -name "Makefile.*" -delete || die
+		dodoc -r examples
+	fi
+}
diff --git a/dev-libs/libconfig/metadata.xml b/dev-libs/libconfig/metadata.xml
new file mode 100644
index 0000000..4c4e44c
--- /dev/null
+++ b/dev-libs/libconfig/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>bugs@bergstroem.nu</email>
+		<name>Johan Bergström</name>
+	</maintainer>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/metadata/md5-cache/dev-libs/libconfig-1.5 b/metadata/md5-cache/dev-libs/libconfig-1.5
new file mode 100644
index 0000000..4e66286
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libconfig-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/libtool sys-devel/bison !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Libconfig is a simple library for manipulating structured configuration files
+EAPI=5
+HOMEPAGE=http://www.hyperrealm.com/libconfig/libconfig.html
+IUSE=+cxx examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=*
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=http://www.hyperrealm.com/libconfig/libconfig-1.5.tar.gz
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=faf1e45ba24d348fd281ef41e8fb762c
diff --git a/metadata/md5-cache/net-misc/sslh-1.17 b/metadata/md5-cache/net-misc/sslh-1.17
new file mode 100644
index 0000000..c5518e7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sslh-1.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install
+DEPEND=caps? ( sys-libs/libcap ) tcpd? ( sys-apps/tcp-wrappers ) dev-libs/libconfig
+DESCRIPTION=Port multiplexer - accept both HTTPS and SSH connections on the same port
+EAPI=5
+HOMEPAGE=http://www.rutschle.net/tech/sslh.shtml
+IUSE=caps tcpd
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap ) tcpd? ( sys-apps/tcp-wrappers ) dev-libs/libconfig
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.rutschle.net/tech/sslh-v1.17.tar.gz
+_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=cacf55565b6c0c615839d2f5d50f5719
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
new file mode 100644
index 0000000..5549234
--- /dev/null
+++ b/net-misc/sslh/Manifest
@@ -0,0 +1 @@
+DIST sslh-v1.17.tar.gz 45447 SHA256 4f3589ed36d8a21581268d53055240eee5e5adf02894a2ca7a6c9022f24b582a SHA512 13e9980f4af4111d1b7c695cc61f6a99dca0dbe6be6391a735ebcd15944094526761dbee1ee52d0a94bff689bd9eeefabe930fc0a515f2389bf0f44e0823a431 WHIRLPOOL ec535e0932ba9debe2a19d6bef81b7a1498c658720bbf2a4a472b7858b7db3062299de605c264bf7dcaad3e912028491f5380c64b8c379ff693243a0a1f9a39a
diff --git a/net-misc/sslh/files/sslh.conf.d-2 b/net-misc/sslh/files/sslh.conf.d-2
new file mode 100644
index 0000000..719be7b
--- /dev/null
+++ b/net-misc/sslh/files/sslh.conf.d-2
@@ -0,0 +1,8 @@
+# /etc/conf.d/sslh
+
+# Options to sslh itself.  See the sslh(1) man page.
+#OPTIONS=""
+
+# Multiplexing example
+# Port 44 can be used for ssh, http, and https. Drop privileges after starting.
+#OPTIONS="-p localhost:44 --ssh 127.0.0.1:22 --http 127.0.0.1:80 --ssl 127.0.0.1:443 --user nobody"
diff --git a/net-misc/sslh/files/sslh.init.d-2 b/net-misc/sslh/files/sslh.init.d-2
new file mode 100755
index 0000000..6122903
--- /dev/null
+++ b/net-misc/sslh/files/sslh.init.d-2
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslh/files/sslh.init.d-2,v 1.2 2012/07/11 15:47:57 kensington Exp $
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start \
+		--pidfile /var/run/${SVCNAME}.pid \
+		--exec /usr/sbin/sslh -- \
+			${OPTIONS} \
+			--pidfile /var/run/${SVCNAME}.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --retry 20 \
+		--pidfile /var/run/${SVCNAME}.pid
+	eend $?
+}
diff --git a/net-misc/sslh/metadata.xml b/net-misc/sslh/metadata.xml
new file mode 100644
index 0000000..07339f6
--- /dev/null
+++ b/net-misc/sslh/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/sslh/sslh-1.17.ebuild b/net-misc/sslh/sslh-1.17.ebuild
new file mode 100644
index 0000000..d34e605
--- /dev/null
+++ b/net-misc/sslh/sslh-1.17.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslh/sslh-1.17.ebuild,v 1.1 2015/03/10 13:44:52 kensington Exp $
+
+EAPI=5
+
+MY_P="${PN}-v${PV}"
+inherit toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
+SRC_URI="http://www.rutschle.net/tech/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE="caps tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+	tcpd? ( sys-apps/tcp-wrappers )
+	dev-libs/libconfig"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		USELIBCAP=$(usev caps) \
+		USELIBWRAP=$(usev tcpd)
+}
+
+src_install() {
+	dosbin sslh-{fork,select}
+	dosym sslh-fork /usr/sbin/sslh
+	doman sslh.8.gz
+	dodoc ChangeLog README.md
+
+	newinitd "${FILESDIR}"/sslh.init.d-2 sslh
+	newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+}