diff --git a/app-misc/irtrans-irserver/Manifest b/app-misc/irtrans-irserver/Manifest
index edf7b285..a000e1ed 100644
--- a/app-misc/irtrans-irserver/Manifest
+++ b/app-misc/irtrans-irserver/Manifest
@@ -6,22 +6,15 @@ AUX irtrans-server.confd 312 RMD160 151927122a9b70a8bcca0f0fb6f7c0e327dc6bec SHA
 MD5 1c16f7f33ed333af77e501bb2a9d5640 files/irtrans-server.confd 312
 RMD160 151927122a9b70a8bcca0f0fb6f7c0e327dc6bec files/irtrans-server.confd 312
 SHA256 ffff7ff71e75349264f7d4447fadeff71c18df95a15fc8ba890460c6fe63327c files/irtrans-server.confd 312
-AUX irtrans-server.initd 614 RMD160 1526085fd3977db8ab422e555929845269b14010 SHA1 99d0a7f4abd144d029439ea1b5f8eb818fabb6db SHA256 e45da6dba983972af62fae97e19faffe99912ed9116a3abf1c4ca6fa075360a9
-MD5 edf1702ad0ef03e828dd39c7b125015f files/irtrans-server.initd 614
-RMD160 1526085fd3977db8ab422e555929845269b14010 files/irtrans-server.initd 614
-SHA256 e45da6dba983972af62fae97e19faffe99912ed9116a3abf1c4ca6fa075360a9 files/irtrans-server.initd 614
-DIST irserver-src.tar.gz 121844 RMD160 fa3195c6e5605a0efd33e9fc605fb52422d79c9b SHA1 0a9967e3712ebad8b45a6f5cf6f556b85c6789df SHA256 412e33e593e9237876bad9a94f12a99b7e5177557be85731fe2400b4a96925ce
-EBUILD irtrans-irserver-5.8.01-r1.ebuild 969 RMD160 e98539b9c50447458ed06b0f528f453f2685ccf4 SHA1 e08589df54683260e3fb337d1b4ef2f53a352057 SHA256 a627000f24cdc8f779f35615d89b41aa2fd7cdfc39859715e84bab81bc81a17b
-MD5 ddf41681af38ac293414f813b0a2e2b7 irtrans-irserver-5.8.01-r1.ebuild 969
-RMD160 e98539b9c50447458ed06b0f528f453f2685ccf4 irtrans-irserver-5.8.01-r1.ebuild 969
-SHA256 a627000f24cdc8f779f35615d89b41aa2fd7cdfc39859715e84bab81bc81a17b irtrans-irserver-5.8.01-r1.ebuild 969
-EBUILD irtrans-irserver-5.8.01.ebuild 968 RMD160 d22635cf6d6ac5d0a01b79decfd404e663edcaf1 SHA1 a941be17d9cc85286bd7e009004c185bdcd5c004 SHA256 5984cd6f1715b8434373d535a106d41cb694101f36249d468cc4cf3253d2a381
-MD5 2f7e3c64f712b08ca55b3f0d342ee758 irtrans-irserver-5.8.01.ebuild 968
-RMD160 d22635cf6d6ac5d0a01b79decfd404e663edcaf1 irtrans-irserver-5.8.01.ebuild 968
-SHA256 5984cd6f1715b8434373d535a106d41cb694101f36249d468cc4cf3253d2a381 irtrans-irserver-5.8.01.ebuild 968
-MD5 468370d5bf3aef4d72189d3f4bd04daa files/digest-irtrans-irserver-5.8.01 238
-RMD160 6782fa98b5071f0f6631f5bbf88d57e4fb3faf10 files/digest-irtrans-irserver-5.8.01 238
-SHA256 20099a65107178ad6aecd004f5697c2d0817a5f21e59d29c97ee0959aeefc44c files/digest-irtrans-irserver-5.8.01 238
-MD5 468370d5bf3aef4d72189d3f4bd04daa files/digest-irtrans-irserver-5.8.01-r1 238
-RMD160 6782fa98b5071f0f6631f5bbf88d57e4fb3faf10 files/digest-irtrans-irserver-5.8.01-r1 238
-SHA256 20099a65107178ad6aecd004f5697c2d0817a5f21e59d29c97ee0959aeefc44c files/digest-irtrans-irserver-5.8.01-r1 238
+AUX irtrans-server.initd 562 RMD160 97dfa1784dc96f093b5c29387fa6183f8c6504cb SHA1 8c7ec04a8c42db7f7bc47e99748c0f9901d42eae SHA256 6d4f1a3fe46f2a047de40af33d9854b26f4bf3aadc2a5b62e00219a3d20bfd0c
+MD5 8798bdcdb4baeadaeb17830f63548197 files/irtrans-server.initd 562
+RMD160 97dfa1784dc96f093b5c29387fa6183f8c6504cb files/irtrans-server.initd 562
+SHA256 6d4f1a3fe46f2a047de40af33d9854b26f4bf3aadc2a5b62e00219a3d20bfd0c files/irtrans-server.initd 562
+DIST irserver-src.tar.gz 122002 RMD160 b6970aff43a7b7e3883f2cdad0331b0f3d431508 SHA1 c6deafcc2a5900c6045d899f1ecdbc8de2184a55 SHA256 a99f2714e99081478c50b32085d4b53c0a0c50bb967a1e616aee0e1668ffdc37
+EBUILD irtrans-irserver-5.8.04.ebuild 874 RMD160 ab6418b80fc895a65cd34c72da47d24b28896fa5 SHA1 1d7bfb678436f5f9f931fcc6254484e2e87a1016 SHA256 35ac2c932536b95e3ac270ade7ddad580e6213bc4b578b332ba16beb40c335f1
+MD5 57b976e9216c5dd16362bd0db99dda26 irtrans-irserver-5.8.04.ebuild 874
+RMD160 ab6418b80fc895a65cd34c72da47d24b28896fa5 irtrans-irserver-5.8.04.ebuild 874
+SHA256 35ac2c932536b95e3ac270ade7ddad580e6213bc4b578b332ba16beb40c335f1 irtrans-irserver-5.8.04.ebuild 874
+MD5 2fb69b9178efae4ea17910e0c33b7caa files/digest-irtrans-irserver-5.8.04 238
+RMD160 a2316341504c6994b340e7f9a0c9e43b336b285c files/digest-irtrans-irserver-5.8.04 238
+SHA256 d93cc85eb3e77a1bcedadd027c6fa19d7b9d72471ee64a21484a568ade2b3324 files/digest-irtrans-irserver-5.8.04 238
diff --git a/app-misc/irtrans-irserver/files/80irtrans-server b/app-misc/irtrans-irserver/files/80irtrans-server
deleted file mode 100644
index 09696661..00000000
--- a/app-misc/irtrans-irserver/files/80irtrans-server
+++ /dev/null
@@ -1,2 +0,0 @@
-PATH=/opt/irtrans/server/bin
-ROOTPATH=/opt/irtrans/server/bin
diff --git a/app-misc/irtrans-irserver/files/digest-irtrans-irserver-5.8.01 b/app-misc/irtrans-irserver/files/digest-irtrans-irserver-5.8.01
deleted file mode 100644
index aa2075df..00000000
--- a/app-misc/irtrans-irserver/files/digest-irtrans-irserver-5.8.01
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 29298133e45e3bcb58e66db9a12f5913 irserver-src.tar.gz 121844
-RMD160 fa3195c6e5605a0efd33e9fc605fb52422d79c9b irserver-src.tar.gz 121844
-SHA256 412e33e593e9237876bad9a94f12a99b7e5177557be85731fe2400b4a96925ce irserver-src.tar.gz 121844
diff --git a/app-misc/irtrans-irserver/files/digest-irtrans-irserver-5.8.01-r1 b/app-misc/irtrans-irserver/files/digest-irtrans-irserver-5.8.01-r1
deleted file mode 100644
index aa2075df..00000000
--- a/app-misc/irtrans-irserver/files/digest-irtrans-irserver-5.8.01-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 29298133e45e3bcb58e66db9a12f5913 irserver-src.tar.gz 121844
-RMD160 fa3195c6e5605a0efd33e9fc605fb52422d79c9b irserver-src.tar.gz 121844
-SHA256 412e33e593e9237876bad9a94f12a99b7e5177557be85731fe2400b4a96925ce irserver-src.tar.gz 121844
diff --git a/app-misc/irtrans-irserver/files/digest-irtrans-irserver-5.8.04 b/app-misc/irtrans-irserver/files/digest-irtrans-irserver-5.8.04
new file mode 100644
index 00000000..842e5793
--- /dev/null
+++ b/app-misc/irtrans-irserver/files/digest-irtrans-irserver-5.8.04
@@ -0,0 +1,3 @@
+MD5 90b6dd3c139d03da04b0b490409fc3d0 irserver-src.tar.gz 122002
+RMD160 b6970aff43a7b7e3883f2cdad0331b0f3d431508 irserver-src.tar.gz 122002
+SHA256 a99f2714e99081478c50b32085d4b53c0a0c50bb967a1e616aee0e1668ffdc37 irserver-src.tar.gz 122002
diff --git a/app-misc/irtrans-irserver/files/irtrans-server.initd b/app-misc/irtrans-irserver/files/irtrans-server.initd
index cd424581..179aaefb 100755
--- a/app-misc/irtrans-irserver/files/irtrans-server.initd
+++ b/app-misc/irtrans-irserver/files/irtrans-server.initd
@@ -10,7 +10,9 @@ depend() {
 
 start() {
 	ebegin "Starting IRTrans"
-	eval start-stop-daemon --start --quiet --exec irserver --pidfile /var/run/irtrans-irserver.pid -- -logfile /var/log/irserver.log -loglevel "${LOGLEVEL}" -pidfile /var/run/irtrans-irserver.pid "${OPT}" "${IRDEVICE}"
+	eval start-stop-daemon --start --quiet --exec irserver --pidfile /var/run/irtrans-irserver.pid \
+				-- -logfile /var/log/irserver.log -loglevel "${LOGLEVEL}" \
+				-pidfile /var/run/irtrans-irserver.pid "${OPT}" "${IRDEVICE}"
 	eend $?
 }
 
diff --git a/app-misc/irtrans-irserver/irtrans-irserver-5.8.01.ebuild b/app-misc/irtrans-irserver/irtrans-irserver-5.8.01.ebuild
deleted file mode 100644
index b5a09db6..00000000
--- a/app-misc/irtrans-irserver/irtrans-irserver-5.8.01.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="IRTrans Server"
-HOMEPAGE="http://www.irtrans.de" 
-SRC_URI="http://www.irtrans.de/download/Server/Linux/irserver-src.tar.gz"
-
-LICENSE="Free"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-
-RDEPEND="virtual/libc"
-
-RESTRICT="nomirror nostrip"
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() { 
-	cd ${WORKDIR}
-	append-flags -m32 -DLINUX -Icommon
-	einfo "CFLAGS=\"${CFLAGS}\""
-	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" irserver || die "emake irserver failed"
- }
-
-src_install() {
-	into /opt/irtrans/server
-	dobin ${WORKDIR}/irserver
-	
-	keepdir /opt/irtrans/server/remotes
-	
-	newinitd "${FILESDIR}"/irtrans-server.initd irtrans-server
-	newconfd "${FILESDIR}"/irtrans-server.confd irtrans-server
-}
-
diff --git a/app-misc/irtrans-irserver/irtrans-irserver-5.8.01-r1.ebuild b/app-misc/irtrans-irserver/irtrans-irserver-5.8.04.ebuild
similarity index 100%
rename from app-misc/irtrans-irserver/irtrans-irserver-5.8.01-r1.ebuild
rename to app-misc/irtrans-irserver/irtrans-irserver-5.8.04.ebuild