diff --git a/dev-libs/sihnon-php-lib/Manifest b/dev-libs/sihnon-php-lib/Manifest
index ef499ee..c26d41e 100644
--- a/dev-libs/sihnon-php-lib/Manifest
+++ b/dev-libs/sihnon-php-lib/Manifest
@@ -1 +1,2 @@
-EBUILD sihnon-php-lib-0.2.5.ebuild 563 RMD160 2bde213d163dd87207c9e6aac197df4195574d9e SHA1 16fb160ef61abec786c67cd6f0a6292daf951e82 SHA256 c8734e3abe1d4b855a647071ce8bb777b7bf47acd34c921db967c61ffd1be495
+DIST sihnon-php-lib-1.1.0.tar.gz 26493 RMD160 a387191f849253dcf568551c94059a4751fff6f5 SHA1 5272a61fd29d9d88b09ad179014822bebae0b148 SHA256 d196a8a4d412cb6f980f509b52d55a37f1c587a8cebacd29e1b7cbbca6332c5c
+EBUILD sihnon-php-lib-1.1.0.ebuild 618 RMD160 34e1b03665dfd9133ebe3a1dd086d7469a8682e8 SHA1 1bed0cb7e45c8d9a06970a27b75b5cf9b5d73e84 SHA256 39625f06440cc244979101efe07d4c10b7a5287a8336bc9e7b3739aa7fca63c5
diff --git a/dev-libs/sihnon-php-lib/sihnon-php-lib-0.2.5.ebuild b/dev-libs/sihnon-php-lib/sihnon-php-lib-1.1.0.ebuild
similarity index 64%
rename from dev-libs/sihnon-php-lib/sihnon-php-lib-0.2.5.ebuild
rename to dev-libs/sihnon-php-lib/sihnon-php-lib-1.1.0.ebuild
index 9bf4102..076cc60 100644
--- a/dev-libs/sihnon-php-lib/sihnon-php-lib-0.2.5.ebuild
+++ b/dev-libs/sihnon-php-lib/sihnon-php-lib-1.1.0.ebuild
@@ -5,15 +5,12 @@
 EAPI=3
 
 inherit eutils
-inherit git
 
 DESCRIPTION="Sihnon PHP Framework"
 HOMEPAGE="http://wiki.sihnon.net/index.php/Sihnon-php-lib"
+SRC_URI="https://github.com/optiz0r/sihnon-php-lib/tarball/release-${PV} -> ${PN}-${PV}.tar.gz"
 
-EGIT_REPO_URI="https://git.sihnon.net/public/sihnon-php-lib.git"
-EGIT_COMMIT="release-${PV}"
-
-LICENSE="bsd"
+LICENSE="CCPL-Attribution-ShareAlike-NonCommercial-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 USE=""
@@ -21,11 +18,9 @@ USE=""
 RDEPEND=">=dev-lang/php-5.3"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-
-	git_src_unpack
-	git_branch
-
+src_prepare() {
+	cd "${WORKDIR}"/optiz0r-sihnon-php-lib-*
+	S=$(pwd)
 }
 
 src_install() {
diff --git a/media-video/ripping-cluster/Manifest b/media-video/ripping-cluster/Manifest
index eac5081..8026211 100644
--- a/media-video/ripping-cluster/Manifest
+++ b/media-video/ripping-cluster/Manifest
@@ -1,3 +1,2 @@
-AUX ripping-cluster-worker.confd 146 RMD160 a34878f83bd7d4ef178cf2ce83ddf3442eb9ecec SHA1 157b91fee4d303e6efaa5713a8047b2c761a4aed SHA256 0847dc873783571dd0f843c244c8d4340dcd622293e8016a3b1100b1e8bd11ea
-AUX ripping-cluster-worker.initd 719 RMD160 6298829ed9af11d74a98ff65762965b84457396a SHA1 c5e9d5ab47c189c0b321353b9d88a2158ffc52b3 SHA256 a36d0ce123058fc836dd05c84463a7d35ec2dc84f89b0dd45ceadf3ea7bfc5c4
-EBUILD ripping-cluster-0.3.ebuild 1798 RMD160 f95338ee22783ab4ace7bdf75dd53fc41bcbd26b SHA1 143b8f1fce549396042eb2ddfc9bf1772adc9a2e SHA256 18c0c8dd041fcf23548dc80b23f8755c8f6051a01bb9c75f09c190b28cfa6f95
+DIST ripping-cluster-0.4.tar.gz 104953 RMD160 d8071a23bdcd6c0c1595948f1076c689a1848add SHA1 1bdf00e19052a2c838ead6dc3dc84b3cd8ca789d SHA256 cef4c12608e55bb09497c0d617a394ded4202674db590b0afb7fc34aa31dee11
+EBUILD ripping-cluster-0.4.ebuild 2128 RMD160 d5d58fb9c9265dcdcd2150f517a958b66d2987ab SHA1 9931cff33eee46c3616111239084e05b54731ac3 SHA256 a1e7234e553cb298300291b6a0a7daaa50e45ca571c6a85fbc059fe610833cc7
diff --git a/media-video/ripping-cluster/files/ripping-cluster-worker.confd b/media-video/ripping-cluster/files/ripping-cluster-worker.confd
deleted file mode 100644
index 631bdb7..0000000
--- a/media-video/ripping-cluster/files/ripping-cluster-worker.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Which user to run the worker daemon as
-USER="media"
-
-# File to store the running daemon's PID in
-PID_FILE="/var/run/ripping-cluster-worker.pid"
diff --git a/media-video/ripping-cluster/files/ripping-cluster-worker.initd b/media-video/ripping-cluster/files/ripping-cluster-worker.initd
deleted file mode 100755
index c1f4688..0000000
--- a/media-video/ripping-cluster/files/ripping-cluster-worker.initd
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount net
-	use dns logger puppetmaster netmount nfsmount
-}
-
-start() {
-	ebegin "Starting ripping-cluster-worker"
-	start-stop-daemon --start --quiet \
-		--background --make-pidfile --pidfile ${PID_FILE} \
-		--chuid ${USER} --user ${USER} \
-		--exec /usr/bin/php /usr/lib/ripping-cluster/worker/ripping-cluster-worker.php
-	eend $? "Failed to start ripping-cluster-worker"
-}
-
-stop() {
-	ebegin "Stopping ripping-cluster-worker"
-	start-stop-daemon --stop --quiet \
-		--pidfile ${PID_FILE}
-	local ret=$?
-	eend ${ret} "Failed to stop puppet"
-	rm -f ${PID_FILE}
-	return ${ret}
-}
-
diff --git a/media-video/ripping-cluster/ripping-cluster-0.3-r1.ebuild b/media-video/ripping-cluster/ripping-cluster-0.4.ebuild
similarity index 65%
rename from media-video/ripping-cluster/ripping-cluster-0.3-r1.ebuild
rename to media-video/ripping-cluster/ripping-cluster-0.4.ebuild
index cce5433..00c023a 100644
--- a/media-video/ripping-cluster/ripping-cluster-0.3-r1.ebuild
+++ b/media-video/ripping-cluster/ripping-cluster-0.4.ebuild
@@ -5,22 +5,19 @@
 EAPI=3
 
 inherit eutils
-inherit git
 
 DESCRIPTION="Distributed ripping cluster manager using HandBrake as a backend"
 HOMEPAGE="http://wiki.sihnon.net/index.php/Ripping-cluster"
+SRC_URI="https://github.com/optiz0r/ripping-cluster/tarball/release-${PV} -> ${PN}-${PV}.tar.gz"
 
-EGIT_REPO_URI="https://git.sihnon.net/public/handbrake-cluster-webui.git"
-EGIT_COMMIT="release-${PV}"
-
-LICENSE="bsd"
+LICENSE="CCPL-Attribution-ShareAlike-NonCommercial-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="webui +worker"
 
 RDEPEND=">=dev-lang/php-5.3
          >=dev-php/smarty-3.0
-         >=dev-libs/sihnon-php-lib-0.2.5
+         >=dev-libs/sihnon-php-lib-1.1.0
 		 >=dev-php/PEAR-Net_Gearman-0.2.3
 		 >=media-video/handbrake-0.9
 "
@@ -32,37 +29,43 @@ pkg_setup() {
 
 }
 
-src_unpack() {
-
-	git_src_unpack
-	git_branch
-
+src_prepare() {
+	cd "${WORKDIR}"/optiz0r-ripping-cluster-*
+	S=$(pwd)
 }
 
 src_install() {
 
 	insinto "/usr/lib/${PN}"
+	dodir source
 
-	doins -r source
+	insinto "/usr/lib/${PN}/source"
+	doins -r source/lib
 
 	if use webui; then
-		doins -r webui
+		doins -r source/webui
 	fi
 
 	if use worker; then
-		doins -r worker
+		doins -r source/worker
 	fi
 
+	insinto "/usr/share/${PN}"
+	doins -r build/schema
+
 	keepdir /etc/ripping-cluster
 	insinto /etc/ripping-cluster
 	doins private/{config.php,dbconfig.conf}.dist
 
-	newinitd ${FILESDIR}/ripping-cluster-worker.initd ripping-cluster-worker
-	newconfd ${FILESDIR}/ripping-cluster-worker.confd ripping-cluster-worker
+	newinitd build/ripping-cluster-worker.init-gentoo ripping-cluster-worker
+	newconfd build/ripping-cluster-worker.conf-gentoo ripping-cluster-worker
 
 	keepdir /var/log/ripping-cluster
 	fowners media /var/log/ripping-cluster
 
+	keepdir /var/run/ripping-cluster
+	fowners media /var/run/ripping-cluster
+
 	dodir /var/tmp/ripping-cluster/{cache,config,templates}
 	fowners media /var/tmp/ripping-cluster/{cache,config,templates}
 
@@ -72,8 +75,8 @@ pkg_postinst() {
 
 	elog "Please now edit config.php and dbconfig.conf."
 	elog ""
-	elog "This version does not come with database init scripts yet:"
-	elog "You will need to create the database manually with this version"
+	elog "Database schemas to setup a new install can be found in:"
+	elog "/usr/share/ripping-cluster/schema"
 	elog ""
 	elog "The daemon will run as the user 'media' by default"
 	elog "Edit /etc/conf.d/ripping-cluster-worker to change this."