diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
similarity index 95%
rename from media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
rename to media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
index 8ea44029c98a4..ba800d6eb61fc 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,9 @@ GENTOO_VDR_CONDITIONAL=yes
 
 DESCRIPTION="VDR Plugin: Xinelib PlugIn"
 HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-SRC_URI="http://vdr.websitec.de/download/${PN}/xineliboutput-2.0.0_p20130821.tar.bz2"
+MY_P=${PN#vdr-}-${PV/_pre/_p}
+SRC_URI="http://vdr.websitec.de/download/${PN}/${MY_P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
similarity index 94%
rename from media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild
rename to media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
index 537dd92935a71..6f0aac3f5d5db 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20150220.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,9 @@ GENTOO_VDR_CONDITIONAL=yes
 
 DESCRIPTION="VDR Plugin: Xinelib PlugIn"
 HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tar.xz"
+MY_PV=${PV/_pre/_p}
+SRC_URI="http://vdr.websitec.de/download/${PN}/${PN}-${MY_PV}.tar.xz"
+S="${WORKDIR}/${VDRPLUGIN}-${MY_PV}"
 
 SLOT="0"
 LICENSE="GPL-2"