diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index d568b293..d3beb672 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*kaffeine-1.0_pre200900704 (04 Jul 2009)
+
+  04 Jul 2009; Mario Fetka <mario.fetka@gmail.com>
+  -kaffeine-0.9_pre200900502.ebuild, +kaffeine-1.0_pre200900704.ebuild:
+  bump
+
 *kaffeine-0.9_pre200900502 (02 May 2009)
 
   02 May 2009; Mario Fetka <mario.fetka@gmail.com>
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 11612bb5..4bb88e1c 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,3 +1,3 @@
-EBUILD kaffeine-0.9_pre200900502.ebuild 753 RMD160 4bc1b52966ea5598818b712b00b3ecbe323a3992 SHA1 fba8b0c5a8c8ff5d7c2c7d479246adffff7c200d SHA256 1a17daf130c14b87a5e8f04e12fdf5f5a3525a0136f6097ed39424737951e065
-MISC ChangeLog 1104 RMD160 85d478defe9dcc0e534a81068a0f993bf5329e6a SHA1 d121fc1fb568879d0039582e8af41978e9b06509 SHA256 cb035673cfdbfea68987bb85e4b54a5362b27e4f9bca6d414534e68a330519c6
+EBUILD kaffeine-1.0_pre200900704.ebuild 840 RMD160 6d4629f251f7c78ee63f6169e70698c8068b777f SHA1 1a8e62a9496b97fe417c7cfa4ba945d6e8dd3744 SHA256 410caa74dbff48f03e3c76b16ef9d2bff59f4ff39e8025ea1cd1da20cae60c27
+MISC ChangeLog 1277 RMD160 9dab9d9c667c2f7ad165f5380f0702af04ca7d3a SHA1 43e007267606cff86f1eee6a07ad6cd0917d33e6 SHA256 ddafd2f22b469ea841d23b1dce605b120f6bfb59944eb8faf8d9cec1edda001f
 MISC metadata.xml 492 RMD160 012e23d9aa6da182cf0d3ad1e744eee999e14f48 SHA1 e706b077970bd64bf96429c694567710741a3a3e SHA256 fb0b7ef4457e7fc25ea0bf2b9837434e5cfe0352719149945438227134bb1bbb
diff --git a/media-video/kaffeine/kaffeine-0.9_pre200900502.ebuild b/media-video/kaffeine/kaffeine-1.0_pre200900704.ebuild
similarity index 66%
rename from media-video/kaffeine/kaffeine-0.9_pre200900502.ebuild
rename to media-video/kaffeine/kaffeine-1.0_pre200900704.ebuild
index bc212d13..a9a9e27b 100644
--- a/media-video/kaffeine/kaffeine-0.9_pre200900502.ebuild
+++ b/media-video/kaffeine/kaffeine-1.0_pre200900704.ebuild
@@ -5,24 +5,30 @@
 EAPI="2"
 
 KMNAME="extragear/multimedia"
-KMMODULE="kaffeinegl"
+KMMODULE="kaffeine"
 inherit kde4-base subversion
-ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/${PN}/@{${PV/0.9_pre/}}"
+ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/${PN}/@{${PV/1.0_pre/}}"
 
 DESCRIPTION="Media player for KDE using xine and gstreamer backends."
 HOMEPAGE="http://kaffeine.sourceforge.net/"
+
 LICENSE="GPL-2"
-
-SLOT="0.9"
 KEYWORDS=""
-IUSE="dvb xcb encode vorbis"
+SLOT="1"
+IUSE="debug dvb xcb encode vorbis"
 
-RDEPEND=">=media-libs/xine-lib-1.1.12
-	xcb? ( >=x11-libs/libxcb-1.0 )
+COMMON_DEPEND="
+	>=media-libs/xine-lib-1.1.12
 	media-sound/cdparanoia
+	x11-libs/libXtst
 	encode? ( media-sound/lame )
 	vorbis? ( media-libs/libvorbis )
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}
+	xcb? ( >=x11-libs/libxcb-1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kdeprefix? ( !media-video/kaffeine:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/inputproto
 	dvb? ( media-tv/linuxtv-dvb-headers )
-	x11-proto/inputproto"
+"