diff --git a/www-apps/gitlab-ci/Manifest b/www-apps/gitlab-ci/Manifest
index b6eb3d0..1c93ec4 100644
--- a/www-apps/gitlab-ci/Manifest
+++ b/www-apps/gitlab-ci/Manifest
@@ -1,3 +1,4 @@
-AUX gitlab-ci-unicorn.init 1684 SHA256 13887832ca41bf45037918824c7ead731ac812eaeba7fcf2149b981f5649ec9a SHA512 8842684dae88331353fdd09554c7404a470238a0e66597a01b4b9dd875db7b5580b082fb4e230fd85e8fd66c276e789473e88c61584845c2b236c00ba79ea9ac WHIRLPOOL 745d07b9eb116dc5742981b3e0b0b36371bdd2e1629bb988643f806b0ace8927d3f16ead0536285272b4508c4961e8dd1583037871782958283aaaf6d1992fb0
+AUX gitlab-ci-unicorn.init 1700 SHA256 ad75c1774db69d2ceae61983ba7227bb840c761d69eb387eaba120553fcd038a SHA512 fc2005db1523777f96867a3983efcb256ee8a3f62146dfc58af5536c0c869d665870b2f6710fe1d2f014fcb921ec3c79066b67b0189a6b525a7aea7f1afff78a WHIRLPOOL c80e72eb0c8f14c56662f91f2f1b51d1bbc83d956dcd3915c354e95ca5c1231c575b1fec91398c345fa71af61efe654e78f85e9d75be3b5624e65021e7102c28
 DIST gitlab-ci-5.0.1.tar.gz 610139 SHA256 5ed7d6de964a05641e14ae6a7bd63e6f32fec345d8f2ea42e6882c67c2228bc1 SHA512 a10f4341001f12f9796594ba2bf1008cbead8ab3f5d98f9de2b56a3f2fc84322841b5bb3cbd596e46bba3ce0285e438ca7597c9f57b84d6231742f8aa64df736 WHIRLPOOL 7b62af01e1202542a3a3c5d947444ebbcee986d2c0c87ebf4191ef2c6e283d261cba675eb405343febd2cdabf028096dc62d7ab0eafa500d05d2033faeadf102
+EBUILD gitlab-ci-5.0.1-r1.ebuild 8569 SHA256 32275bff92080558d5760be218c4898739c46a7b29f61eb601024f2886e881d6 SHA512 adba0e3f2ddad8788f6a996878f139e02ad97a20e5a496cb84a5acd78693e6bc75e092a9c2df6998e4cbaadf1bff7f1f416e158b78592d811ef4cee5a3f6cbd2 WHIRLPOOL 7fdf0f24e4777ca57cdcc08032c0ebd7af3ba19429e448e78b395a8e68f79c43c254f0fdc9f443b65ca60e47cb819ada2a960fdaf982dac86524339736c93f8a
 EBUILD gitlab-ci-5.0.1.ebuild 8554 SHA256 9a36f396ff2a108f5511bfe2e51907bbca7a4c817144df757e885e1ff6bf89f6 SHA512 8ce728b61ea87272c06a5aa835e5132e41df5723a9a746243c52e2b9ed0f06fa601576952dce2f2410173f45b4dddd71db79adea68699415d9a14c4071ed1685 WHIRLPOOL 5d181c4eb76f301bfddf777efe78f3943773f656218fd51c4a6793e3908ef7ba8052badec042d82be168caee9f64421e0ee21cace4866688f9f31261446e0fd9
diff --git a/www-apps/gitlab-ci/files/gitlab-ci-unicorn.init b/www-apps/gitlab-ci/files/gitlab-ci-unicorn.init
index bd89114..da3dd7c 100755
--- a/www-apps/gitlab-ci/files/gitlab-ci-unicorn.init
+++ b/www-apps/gitlab-ci/files/gitlab-ci-unicorn.init
@@ -23,6 +23,7 @@ depend() {
 	provide gitlab-ci
 	need redis
 	use net
+	after bootmisc
 }
 
 start() {
diff --git a/www-apps/gitlab-ci/gitlab-ci-5.0.1-r1.ebuild b/www-apps/gitlab-ci/gitlab-ci-5.0.1-r1.ebuild
new file mode 100644
index 0000000..d8659cf
--- /dev/null
+++ b/www-apps/gitlab-ci/gitlab-ci-5.0.1-r1.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+# Maintainer notes:
+# - This ebuild uses Bundler to download and install all gems in deployment mode
+#   (i.e. into isolated directory inside application). That's not Gentoo way how
+#   it should be done, but GitLab has too many dependencies that it will be too
+#   difficult to maintain them via ebuilds.
+#
+
+USE_RUBY="ruby19 ruby20 ruby21"
+PYTHON_DEPEND="2:2.7"
+
+inherit eutils python ruby-ng user
+
+DESCRIPTION="GitLab CI is a continuous integration server that is tightly integrated with GitLab"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-ci"
+SRC_URI="https://github.com/gitlabhq/gitlab-ci/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+RESTRICT="mirror"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql +postgres"
+
+## Gems dependencies:
+#   charlock_holmes		dev-libs/icu
+#   grape, capybara		dev-libs/libxml2, dev-libs/libxslt
+#   pg					dev-db/postgresql-base
+#   mysql				virtual/mysql
+#
+
+GEMS_DEPEND="
+	dev-libs/icu
+	dev-libs/libxml2
+	dev-libs/libxslt
+	postgres? ( dev-db/postgresql-base )
+	mysql? ( virtual/mysql )"
+DEPEND="${GEMS_DEPEND}
+	dev-vcs/git"
+RDEPEND="${DEPEND}
+	dev-db/redis
+	virtual/mta"
+ruby_add_bdepend "
+	virtual/rubygems
+	>=dev-ruby/bundler-1.0"
+
+# no patches needed so far ...
+#RUBY_PATCHES=(
+#)
+
+MY_NAME="gitlab-ci"
+MY_USER="gitlab_ci"
+
+DEST_DIR="/opt/${MY_NAME}"
+CONF_DIR="/etc/${MY_NAME}"
+LOGS_DIR="/var/log/${MY_NAME}"
+TEMP_DIR="/var/tmp/${MY_NAME}"
+RUN_DIR="/run/${MY_NAME}"
+
+# When updating ebuild to newer version, check list of the queues in
+# https://gitlab.com/gitlab-org/gitlab-ci/blob/v${PV}/script/background_jobs
+SIDEKIQ_QUEUES="runner,common,default"
+
+pkg_setup() {
+	enewgroup gitlab_ci
+	enewuser gitlab_ci -1 /bin/bash ${DEST_DIR} "gitlab_ci,cron,redis"
+}
+
+all_ruby_prepare() {
+
+	# fix paths
+	sed -i -E \
+		-e "s|redis://redis.example.com:6379|unix:/run/redis/redis.sock|" \
+		config/resque.yml.example || die "failed to filter resque.yml.example"
+	sed -i -E \
+		-e "s|/home/gitlab_ci/gitlab-ci/tmp/(pids\|sockets)|${RUN_DIR}|" \
+		-e "s|/home/gitlab_ci/gitlab-ci/log|${LOGS_DIR}|" \
+		-e "s|/home/gitlab_ci/gitlab-ci|${DEST_DIR}|" \
+		config/unicorn.rb.example || die "failed to filter unicorn.rb.example"
+	
+	sed -i \
+		-e "s|/home/gitlab_ci/gitlab-ci/tmp/sockets|${RUN_DIR}|" \
+		-e "s|/home/gitlab_ci/gitlab-ci/public|${DEST_DIR}/public|" \
+		lib/support/nginx/gitlab_ci || die "failed to filter nginx/gitlab_ci"
+	
+	# modify default database settings for PostgreSQL
+	sed -i -E \
+		-e 's|(username:).*|\1 gitlab|' \
+		-e 's|(password:).*|\1 gitlab|' \
+		-e 's|(socket:).*|/run/postgresql/.s.PGSQL.5432|' \
+		config/database.yml.postgresql \
+		|| die "failed to filter database.yml.postgresql"
+	# modify default database settings for MySQL
+	sed -i -E \
+		-e "s|/tmp/mysql.sock|/run/mysqld/mysqld.sock|" \
+		config/database.yml.mysql || die "failed to filter database.yml.mysql"
+
+	# rename config files
+	mv config/application.yml.example config/application.yml
+	mv config/unicorn.rb.example config/unicorn.rb
+
+	local dbconf=config/database.yml
+	if use postgres && ! use mysql; then
+		mv ${dbconf}.postgresql ${dbconf}
+		rm ${dbconf}.mysql
+	elif use mysql && ! use postgres; then
+		mv ${dbconf}.mysql ${dbconf}
+		rm ${dbconf}.postgresql
+	fi
+	
+	# remove useless files
+	rm -r lib/support/init.d
+}
+
+all_ruby_install() {
+	local dest=${DEST_DIR}
+	local conf=${CONF_DIR}
+	local logs=${LOGS_DIR}
+	local temp=${TEMP_DIR}
+	local runs=${RUN_DIR}
+
+	# prepare directories
+	diropts -m750
+	dodir ${logs} ${temp}
+
+	diropts -m755
+	dodir ${conf} ${dest}/public/uploads
+
+	dosym ${temp} ${dest}/tmp
+	dosym ${logs} ${dest}/log
+
+	# install configs
+	insinto ${conf}
+	doins -r config/*
+	dosym ${conf} ${dest}/config
+
+	echo 'export RAILS_ENV=production' > "${D}/${dest}/.profile"
+
+	# remove needless dirs
+	rm -Rf config tmp log
+
+	# install the rest files
+	# using cp 'cause doins is slow
+	cp -Rl * "${D}/${dest}"/
+
+	# install logrotate config
+	dodir /etc/logrotate.d
+	cat > "${D}/etc/logrotate.d/${MY_NAME}" <<-EOF
+		${logs}/*.log {
+		    missingok
+		    delaycompress
+		    compress
+		    copytruncate
+		}
+	EOF
+
+	## Install gems via bundler ##
+
+	cd "${D}/${dest}"
+
+	local without="development test aws"
+	local flag; for flag in mysql postgres; do
+		without+="$(use $flag || echo ' '$flag)"
+	done
+	local bundle_args="--deployment ${without:+--without ${without}}"
+
+	einfo "Running bundle install ${bundle_args} ..."
+	${RUBY} /usr/bin/bundle install ${bundle_args} || die "bundler failed"
+
+	# clean gems cache
+	rm -Rf vendor/bundle/ruby/*/cache
+
+	# fix permissions
+	fowners -R ${MY_USER}:${MY_USER} ${dest} ${temp} ${logs}
+	fowners ${MY_USER}:${MY_USER} ${conf}/database.yml
+	fperms 640 ${conf}/database.yml
+
+	## RC script ##
+
+	local rcscript=gitlab-ci-unicorn.init
+
+	cp "${FILESDIR}/${rcscript}" "${T}" || die
+	sed -i \
+		-e "s|@USER@|${MY_USER}|" \
+		-e "s|@GITLAB_CI_BASE@|${dest}|" \
+		-e "s|@LOGS_DIR@|${logs}|" \
+		-e "s|@RUN_DIR@|${runs}|" \
+		-e "s|@QUEUES@|${SIDEKIQ_QUEUES}|" \
+		"${T}/${rcscript}" \
+		|| die "failed to filter ${rcscript}"
+
+	newinitd "${T}/${rcscript}" "${MY_NAME}"
+}
+
+pkg_postinst() {
+	elog
+	elog "1. Configure your GitLab CI's settings in ${CONF_DIR}/application.yml."
+	elog
+	elog "2. Configure your database settings in ${CONF_DIR}/database.yml"
+	elog "   for \"production\" environment."
+	elog
+	elog "3. Adjust the webserver settings in ${CONF_DIR}/unicorn.rb"
+	elog
+	elog "4. Then you should create a database for your GitLab CI instance, if you"
+	elog "haven't done so already."
+	elog
+	if use postgres; then
+        elog "If you have local PostgreSQL running, just copy&run:"
+        elog "      su postgres"
+        elog "      psql -c \"CREATE ROLE gitlab_ci PASSWORD 'gitlab_ci' \\"
+        elog "          NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\""
+        elog "      createdb -E UTF-8 -O gitlab_ci gitlab_ci_production"
+		elog "  Note: You should change your password to something more random..."
+		elog
+	fi
+	elog "4. Finally execute the following command to initlize environment:"
+	elog "       emerge --config \"=${CATEGORY}/${PF}\""
+	elog "   Note: Do not forget to start Redis server first!"
+	elog
+	elog "If this is an update from previous version, it's HIGHLY recommended"
+	elog "to backup your database before running the config phase!"
+}
+
+pkg_config() {
+	einfo "Checking configuration files"
+
+	if [ ! -r "${CONF_DIR}/database.yml" ]; then
+		eerror "Copy ${CONF_DIR}/database.yml.* to"
+		eerror "${CONF_DIR}/database.yml and edit this file in order to configure your" 
+		eerror "database settings for \"production\" environment."; die
+	fi
+
+
+	local email_from="$(ryaml ${CONF_DIR}/application.yml production gitlab_ci email_from)"
+	local gitlab_ci_home="$(egethome ${MY_USER})"
+	
+	# configure Git global settings
+	if [ ! -e "${gitlab_ci_home}/.gitconfig" ]; then
+		einfo "Setting git user"
+		su -l ${MY_USER} -c "
+			git config --global user.email '${email_from}';
+			git config --global user.name 'GitLab CI'" \
+			|| die "failed to setup git name and email"
+	fi
+
+	if [ ! -d "${DEST_DIR}/.git" ]; then
+		# create dummy git repo as workaround for
+		# https://github.com/bundler/bundler/issues/2039
+		einfo "Initializing dummy git repository to avoid false errors from bundler"
+		su -l ${MY_USER} -c "
+			cd ${DEST_DIR}
+			git init
+			git add README.md
+			git commit -m 'Dummy repository'" >/dev/null
+	fi
+
+	## Initialize app ##
+
+	local RAILS_ENV="production"
+	local RUBY=${RUBY:-/usr/bin/ruby}
+	local BUNDLE="${RUBY} /usr/bin/bundle"
+
+	local dbname="$(ryaml ${CONF_DIR}/database.yml production database)"
+
+	if [ -f "${DEST_DIR}/.secret" ]; then
+		local update=true
+
+		einfo "Migrating database ..."
+		exec_rake db:migrate
+
+	else
+		local update=false
+
+		einfo "Initializing database ..."
+		exec_rake setup
+
+		einfo "Setting up cron schedules ..."
+		exec_rake whenever -w
+	fi
+	
+	if [ "${update}" = 'true' ]; then
+		ewarn
+		ewarn "This configuration script runs only common migration tasks."
+		ewarn "Please read guides on"
+		ewarn "    https://gitlab.com/gitlab-org/gitlab-ci/tree/v${PV}/doc/update"
+		ewarn "for any additional migration tasks specific to your previous GitLab CI"
+		ewarn "version."
+	fi
+}
+
+ryaml() {
+	ruby -ryaml -e 'puts ARGV[1..-1].inject(YAML.load(File.read(ARGV[0]))) {|acc, key| acc[key] }' "$@"
+}
+
+exec_rake() {
+	local command="${BUNDLE} exec rake $@ RAILS_ENV=${RAILS_ENV}"
+
+	echo "   ${command}"
+	su -l ${MY_USER} -c "
+		export LANG=en_US.UTF-8; export LC_ALL=en_US.UTF-8
+		cd ${DEST_DIR}
+		${command}" \
+		|| die "failed to run rake $@"
+}