diff --git a/dev-util/sonarqube-bin/Manifest b/dev-util/sonarqube-bin/Manifest
index cd01bd5ed..fe3ad178c 100644
--- a/dev-util/sonarqube-bin/Manifest
+++ b/dev-util/sonarqube-bin/Manifest
@@ -1,2 +1,3 @@
 DIST sonarqube-7.7.zip 196832147 BLAKE2B 14f54c6d687e25fef605a0cb44c371680a335d240ff5867c83e002c2967b3f8a5054a071b439380e491a144e37f033405fb5024626e1aa1c79a47a723e5938f2 SHA512 2da0d0143c9158bd958bbff08a0ca3a249e7bbc17acc789b8ba11cd6aa481f1d37d57497ce28f0e724d25d1008f2b0684df73b9cd39fc879e4c183e9c1d85e7a
 DIST sonarqube-7.8.zip 205736714 BLAKE2B 09d6c037e00ffb6eeef8afe2786cfbd6ae069667a5055aa1294d7552d81071d25235981a8950c60c57277626695c8312e86482654e53413d428db93a3eed073c SHA512 2d72dd268afb980ded12f0fec268f8fffc02c0100361be57b4dc938d4c252121884bb08ed42fed60577163be1b50e58b382bb0ccb960e3af52b722567ef8a1db
+DIST sonarqube-7.9.zip 206172863 BLAKE2B 76ffa3c7d1a7323fc29c0f06e4ef194a1e2bdc8e50217b613251cf266415fc2b230d81267dceebb4f023e64ebd693b1bbbd570e2433a24b17c6ad76243ff7670 SHA512 dac50ffd10ec0d32bbbfbf4b21d1eb34e1c3bae200abf08cb3e2359fc7673ea20f5f0f2b37c68413cc7e8b7b6258422b722ae3c4776cb5407983b72a97c5cb36
diff --git a/dev-util/sonarqube-bin/sonarqube-bin-7.9.ebuild b/dev-util/sonarqube-bin/sonarqube-bin-7.9.ebuild
new file mode 100644
index 000000000..e4458b5e5
--- /dev/null
+++ b/dev-util/sonarqube-bin/sonarqube-bin-7.9.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="SonarQube Community Edition is an open platform to manage code quality."
+HOMEPAGE="https://www.sonarqube.org/"
+LICENSE="LGPL-3"
+MY_PV="${PV/_alpha/M}"
+MY_PV="${MY_PV/_rc/-RC}"
+MY_P="sonarqube-${MY_PV}"
+SRC_URI="https://binaries.sonarsource.com/Distribution/sonarqube/${MY_P}.zip"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=virtual/jdk-1.8"
+
+INSTALL_DIR="/opt/sonar"
+
+pkg_setup() {
+	#enewgroup <name> [gid]
+	enewgroup sonar
+	#enewuser <user> [uid] [shell] [homedir] [groups] [params]
+	enewuser sonar -1 /bin/bash /opt/sonar "sonar"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# TODO remove unneeded files
+}
+
+src_install() {
+	insinto ${INSTALL_DIR}
+	doins -r bin conf data elasticsearch extensions lib logs temp web COPYING
+	insinto ${INSTALL_DIR}/bin
+	doins "${FILESDIR}"/linux-multiarch.sh
+
+	newconfd "${FILESDIR}/sonar.conf" sonar
+	newinitd "${FILESDIR}/sonar.init" sonar
+
+	if use systemd; then
+		systemd_dounit "${FILESDIR}"/sonar.service
+	fi
+
+	fowners -R sonar:sonar ${INSTALL_DIR}
+
+#	fperms 755 "${INSTALL_DIR}/bin/linux-x86-32/sonar.sh"
+#	fperms 755 "${INSTALL_DIR}/bin/linux-x86-32/wrapper"
+
+	fperms 755 "${INSTALL_DIR}/bin/linux-x86-64/sonar.sh"
+	fperms 755 "${INSTALL_DIR}/bin/linux-x86-64/wrapper"
+
+	fperms 755 "${INSTALL_DIR}/bin/linux-multiarch.sh"
+
+	fperms -R 755 "${INSTALL_DIR}/elasticsearch"
+
+	# Protect Sonar conf on upgrade
+	echo "CONFIG_PROTECT=\"${INSTALL_DIR}/conf\"" > "${T}/25sonar" || die
+	doenvd "${T}/25sonar"
+}
+
+pkg_postinst() {
+	einfo "Please complete the upgrade using the following guideline:"
+	einfo "https://docs.sonarqube.org/display/SONAR/Upgrading"
+}