diff --git a/www-apps/etherpad-lite/Manifest b/www-apps/etherpad-lite/Manifest
new file mode 100644
index 0000000..f2688dd
--- /dev/null
+++ b/www-apps/etherpad-lite/Manifest
@@ -0,0 +1,4 @@
+AUX etherpad-lite-1.6-conf.d 194 BLAKE2B c60ffecc812ba4395f9ecdaeba2b3cb4b542d26924c50c680ac2af32ee100816417728c7fc525ec8aab832bb1c9a6b0f9d4c048cb316c2d48ac061161e782a20 SHA512 e43432240f34c0ba758978e8c98c3d00a91a99415cac072a7da4ca103f05fff509332d377c3ca8b6e68153ca5f2e5f1a5ee799b468fcf9d9d0f26321e273741c
+AUX etherpad-lite-1.6-init.d 1673 BLAKE2B 62821427ce2bf323fec3f7b5853862ea1418a4fc72b02e68a09248f3e34493bebf6e1b0115c35029232095317f2b903f9b3501026ee113fc7ae15da6d12529fd SHA512 b81a4df9940bdc6e259dbeb4bd490945e5ef253ff67ffe8ba4081ecea98d95c35b94364e528570ff293015f1eb50e3230adf2f9bac3dc56a6e69396c376b99e2
+DIST etherpad-lite-1.6.6.tar.gz 1230753 BLAKE2B 7668e17ffdc7ceef4a877f88c3dab0e2b113d0a92ee07d5f67185a869a1141d2e356988950b578ba58c3daecf3e81d93ea503b2a1b0c3a6297fe45db4c61ec43 SHA512 dd67d0a35faa155849faf5f48e4b0f3e23ea8358920c63092b3894093761d34a8f461d12ec3485d5f2ac332fcfa294a1e7b41c6ff810a1cba7b7f44ab8dc3ff8
+EBUILD etherpad-lite-1.6.6.ebuild 1271 BLAKE2B d09937641dd39336a2b5cd8431f6282ed3f74137b60cc081ad75e3f6cca7e92c9cc0eebab11968fe98d839ee2a4940abc0fd9004108c027608c6cefd529915d6 SHA512 4cbd769bc2fe8b45f236ac11fceecd1979c51c90ef58756f8a9cddd60340010a289c5a3e04ba629ab41d4ff5cafeb8d0e2aeb79686523b40864f537f25c71481
diff --git a/www-apps/etherpad-lite/etherpad-lite-1.6.6.ebuild b/www-apps/etherpad-lite/etherpad-lite-1.6.6.ebuild
new file mode 100644
index 0000000..87bbff5
--- /dev/null
+++ b/www-apps/etherpad-lite/etherpad-lite-1.6.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit user versionator
+DESCRIPTION="A really-real time collaborative word processor for the web"
+HOMEPAGE="http://etherpad.org"
+SRC_URI="https://github.com/ether/etherpad-lite/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+DEPEND=">=net-libs/nodejs-0.10.40"
+RDEPEND="${DEPEND}"
+
+ETHERPAD_DEST="/usr/share/${PN}"
+ETHERPAD_LOG="/var/log/${PN}"
+ETHERPAD_USER="etherpad"
+ETHERPAD_GROUP="daemon"
+
+pkg_setup() {
+    enewgroup ${ETHERPAD_GROUP}
+    enewuser ${ETHERPAD_USER} -1 -1 ${ETHERPAD_DEST} "${ETHERPAD_GROUP}"
+}
+
+src_prepare()
+{
+    default
+	./bin/installDeps.sh || die
+}
+
+src_install()
+{
+	insinto "/etc/${PN}"
+	doins "settings.json"
+	rm "settings.json"
+	dosym "/etc/${PN}/settings.json" "${ETHERPAD_DEST}/settings.json"
+
+    mkdir -p "${D}${ETHERPAD_DEST}"
+    cp -a . "${D}${ETHERPAD_DEST}"
+
+    keepdir "${ETHERPAD_LOG}"
+    fowners "${ETHERPAD_USER}:${ETHERPAD_GROUP}" "${ETHERPAD_LOG}"
+
+    newconfd "${FILESDIR}/${PN}-$(get_version_component_range 1-2)-conf.d" "${PN}"
+    newinitd "${FILESDIR}/${PN}-$(get_version_component_range 1-2)-init.d" "${PN}"
+}
diff --git a/www-apps/etherpad-lite/files/etherpad-lite-1.6-conf.d b/www-apps/etherpad-lite/files/etherpad-lite-1.6-conf.d
new file mode 100644
index 0000000..795bdb6
--- /dev/null
+++ b/www-apps/etherpad-lite/files/etherpad-lite-1.6-conf.d
@@ -0,0 +1,6 @@
+#ETHERPAD_PATH="/usr/share/etherpad-lite/"
+#ETHERPAD_ARGS=""
+#ETHERPAD_LOG="/var/log/etherpad-lite"
+#ETHERPAD_USER="etherpad"
+#ETHERPAD_GROUP="daemon"
+#ETHERPAD_PIDFILE="/run/etherpad-lite.pid"
diff --git a/www-apps/etherpad-lite/files/etherpad-lite-1.6-init.d b/www-apps/etherpad-lite/files/etherpad-lite-1.6-init.d
new file mode 100644
index 0000000..25557a2
--- /dev/null
+++ b/www-apps/etherpad-lite/files/etherpad-lite-1.6-init.d
@@ -0,0 +1,52 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+ETHERPAD_USER=${ETHERPAD_USER:=etherpad}
+ETHERPAD_GROUP=${ETHERPAD_GROUP:=daemon}
+ETHERPAD_PATH=${ETHERPAD_PATH:=/usr/share/etherpad-lite}
+ETHERPAD_PID=${ETHERPAD_PID:-/run/etherpad-lite.pid}
+ETHERPAD_DAEMON_NAME=${ETHERPAD_DAEMON_NAME:=etherpad-lite}
+ETHERPAD_NODE=${ETHERPAD_NODE:=/usr/bin/node}
+ETHERPAD_LOG=${ETHERPAD_LOG:=/var/log/etherpad-lite}
+
+start_pre() {
+	checkpath -f -m 0400 -o "${ETHERPAD_USER}":"${ETHERPAD_GROUP}" "${ETHERPAD_PATH}/SESSIONKEY.txt"
+	checkpath -f -m 0400 -o "${ETHERPAD_USER}":"${ETHERPAD_GROUP}" "${ETHERPAD_PATH}/APIKEY.txt"
+	checkpath -d -m 0700 -o "${ETHERPAD_USER}":"${ETHERPAD_GROUP}" "${ETHERPAD_PATH}/var"
+	checkpath -d -m 0700 -o "${ETHERPAD_USER}":"${ETHERPAD_GROUP}" "${ETHERPAD_PATH}/node_modules"
+	checkpath -d -m 0700 -o "${ETHERPAD_USER}":"${ETHERPAD_GROUP}" "${ETHERPAD_PATH}/src/node_modules"
+}
+
+start(){
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon \
+		-S \
+		-x ${ETHERPAD_NODE} \
+		-n ${ETHERPAD_DAEMON_NAME} \
+		-d ${ETHERPAD_PATH} \
+                -u ${ETHERPAD_USER} \
+                -g ${ETHERPAD_GROUP} \
+		-1 ${ETHERPAD_LOG}/stdout.log \
+		-2 ${ETHERPAD_LOG}/stderr.log \
+                -b \
+		-m \
+		-p ${ETHERPAD_PID} -- \
+		"src/node/server.js" ${ETHERPAD_ARGS}
+}
+
+stop(){
+	ebegin "Stopping ${SVCNAME}"
+        start-stop-daemon \
+                -K \
+                -x ${ETHERPAT_NODE} \
+                -d ${ETHERPAD_PATH} \
+                -u ${ETHERPAD_USER} \
+                -g ${ETHERPAD_GROUP} \
+                -p ${ETHERPAD_PID}
+}
+
+depend() {
+	need net
+}