diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
new file mode 100644
index 0000000..8a4a72c
--- /dev/null
+++ b/www-apps/drupal/Manifest
@@ -0,0 +1,3 @@
+AUX postinstall-en.txt 1595 SHA256 af706f90b7671b0b6e4577c48490a71f97f78d8876d84ccd69d48040a7b7340e SHA512 6a0a5388d40b3c49f3c685a6a7986c2a9efe3e6d7c5115fbb3110ebe4c19c605a4ff785447a20c0296f3cb16811a8a6e77f2439d58253a011603709c9dd9b760 WHIRLPOOL 8d210bb0de40134f2e82f43b6b6261f28454f79d69f38bea4c8e27a0ebb71cd59b0518aa24955a4623b29cd457364fca263c987ee4635ef934571897c3ce47e4
+DIST drupal-8.4.0.tar.gz 13379442 SHA256 d6bd8182da6ab07c72557cc5cffe0a44ea2a8f8ab69831c6cd28d051e12e5013 SHA512 1906d42a46a606bc88da57d9817e97ef65c159f38e89fc2e8736849169f76912ceb59a09d2e3388b0dacb4933d829c3d1ad60c8386299086fffe385d922c880c WHIRLPOOL ca7fcbbe12c0b5205037a8b1bcfbad8a8dd687e74399049250d049fdf9c23016fe27a2eed231c0dfca2bf8e526dcd6a51446dfe18b1c73ed3ea66d920bc96e2d
+EBUILD drupal-8.4.0.ebuild 2428 SHA256 bf527904a96359bbad8aca7e0fb2d9cc45fed7de4b0e90c4d96dbcd35ea0593d SHA512 62d870e7b416ade4bee62d260c9518ada5077ceb8918ef40b5143d0644af1845f0e660208336e57d5cad7c63cc88ca1e6b185b0d3df9cc6c5ea4dae1efb3ab24 WHIRLPOOL bb20edaf9029933b5f2efa45004507969d542cfa37ae91f92bffe763e9ab2c55fec61ba914d4172c1f36408c418cd52aeff9cf980c8920b3c8972f021a9732c3
diff --git a/www-apps/drupal/drupal-8.4.0.ebuild b/www-apps/drupal/drupal-8.4.0.ebuild
new file mode 100644
index 0000000..d0f9fcc
--- /dev/null
+++ b/www-apps/drupal/drupal-8.4.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="+accelerator +mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml]
+	virtual/httpd-php
+	accelerator? ( ||
+		(
+			dev-php/xcache
+			(
+				>=dev-lang/php-5.5[opcache]
+				dev-php/pecl-apcu
+			)
+		)
+	)
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	sqlite? ( dev-lang/php[sqlite] )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites/default/settings.php
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/drupal/files/postinstall-en.txt b/www-apps/drupal/files/postinstall-en.txt
new file mode 100644
index 0000000..f507dc3
--- /dev/null
+++ b/www-apps/drupal/files/postinstall-en.txt
@@ -0,0 +1,41 @@
+You will need to provide a database for your drupal installation.  
+
+This assumes you have some knowledge of MySQL, and already have it
+installed and configured. If not, please refer to the Gentoo MySQL
+guide at the following URL:
+
+https://wiki.gentoo.org/wiki/MySQL/Startup_Guide
+
+Once you have a database ready all you need to do is to go to this 
+location
+
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+
+and provide the credentials required for the database access.
+
+If you installed into a vhost, for the above address to be accurate,
+you need to pass -h "<host>" and -d "<install dir>" into webapp_config.
+The protocol is hardcoded, so you'll have to use https:// if you're
+using an SSL / TLS connection.
+
+SECURITY NOTICE: If you use SSL on your Drupal installation, you
+should enable the PHP configuration option 'session.cookie-secure'
+to make it harder for attackers to sniff session cookies.
+
+References:
+CVE-2008-3661
+http://www.php.net/manual/en/session.configuration.php#ini.session.cookie-secure
+http://drupal.org/node/315703
+
+To run Drupal on a web server[1] other than apache, one needs to do
+some work, mostly related to adding the configuration in the .htaccess
+files to the web server config files and enabling redirection.
+For lighttpd you may want to check [2][3] and for nginx [4][5].
+
+ [1] - https://www.drupal.org/requirements/webserver
+ [2] - https://groups.drupal.org/lighttpd
+ [3] - https://www.drupal.org/node/43782
+ [4] - https://www.drupal.org/node/1030854
+ [5] - https://www.nginx.com/resources/wiki/start/topics/recipes/drupal/
+
+After that you can start to use drupal.