diff --git a/app-misc/irtrans-irserver/ChangeLog b/app-misc/irtrans-irserver/ChangeLog
new file mode 100644
index 00000000..b440791c
--- /dev/null
+++ b/app-misc/irtrans-irserver/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for app-misc/irtrans-irserver
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  30 Jul 2007; Mario Fetka <mario-fetka@gmx.at>
+  -irtrans-irserver-5.8.04.ebuild, -irtrans-irserver-5.8.18.ebuild,
+  +irtrans-irserver-5.8.18-r1.ebuild, files/irtrans-server.initd:
+  Add amd64 Support
+
diff --git a/app-misc/irtrans-irserver/Manifest b/app-misc/irtrans-irserver/Manifest
index 7a5a1f23..06fa9ec9 100644
--- a/app-misc/irtrans-irserver/Manifest
+++ b/app-misc/irtrans-irserver/Manifest
@@ -2,23 +2,19 @@ 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 583 RMD160 d7749195302f59ffb91d3f90c7c0033fb5f93cfc SHA1 6807bf1f09d452621bd804cd1a8e5cd0070a6700 SHA256 ede0de44381401911416ca6dde948258b2c6c9c32052b4f4725e90ba8389d6d0
-MD5 43e62d9c54abe948c975934384a41c9d files/irtrans-server.initd 583
-RMD160 d7749195302f59ffb91d3f90c7c0033fb5f93cfc files/irtrans-server.initd 583
-SHA256 ede0de44381401911416ca6dde948258b2c6c9c32052b4f4725e90ba8389d6d0 files/irtrans-server.initd 583
+AUX irtrans-server.initd 584 RMD160 27c16dce1a7a16fe4f0473e09a4bb2053b561a58 SHA1 3747668438ba2ade5dff56f2ea9e37d02881b91a SHA256 fb52f02709f6c151354918ea871d48983c4e0f24f461b63d0437b4a7c95554d5
+MD5 9bdbfd92cd49f57f2a84e0b21fa7b037 files/irtrans-server.initd 584
+RMD160 27c16dce1a7a16fe4f0473e09a4bb2053b561a58 files/irtrans-server.initd 584
+SHA256 fb52f02709f6c151354918ea871d48983c4e0f24f461b63d0437b4a7c95554d5 files/irtrans-server.initd 584
 DIST irserver-src-5.8.18.tar.gz 123837 RMD160 18e5d86c4efab6a744c947a2ef4cf7dbfb45c716 SHA1 b116a18a10b7f3e768edec650455cfed7a97cf79 SHA256 d98a730d273a95803ef71b6b8e60cf38bec86de2a84c7af9909dc0a7c868280d
-DIST irserver-src.tar.gz 122002 RMD160 b6970aff43a7b7e3883f2cdad0331b0f3d431508 SHA1 c6deafcc2a5900c6045d899f1ecdbc8de2184a55 SHA256 a99f2714e99081478c50b32085d4b53c0a0c50bb967a1e616aee0e1668ffdc37
-EBUILD irtrans-irserver-5.8.04.ebuild 873 RMD160 017ad1debd594b80b054d55755560d6513a00a81 SHA1 63f8dd1ed97b67fb491238d8ab3c9bd57c625a29 SHA256 89e00cbd51aa7be85f6097d6508314c482bf82d4adacd38861438e4e8931b4cf
-MD5 9f2741b1a4d7efff9f787743410938e7 irtrans-irserver-5.8.04.ebuild 873
-RMD160 017ad1debd594b80b054d55755560d6513a00a81 irtrans-irserver-5.8.04.ebuild 873
-SHA256 89e00cbd51aa7be85f6097d6508314c482bf82d4adacd38861438e4e8931b4cf irtrans-irserver-5.8.04.ebuild 873
-EBUILD irtrans-irserver-5.8.18.ebuild 862 RMD160 a8680bc3628aefb5583d3edfdc57ccfc531e5e1e SHA1 3942e378ffb3f4bae17c163f91cc53d637d2068c SHA256 30a5b19a287e6f4898dc5e491e2ffcb97ea4a12018e64cc94208ad15ccc3618d
-MD5 92d1e50fae72493aaad0089998341137 irtrans-irserver-5.8.18.ebuild 862
-RMD160 a8680bc3628aefb5583d3edfdc57ccfc531e5e1e irtrans-irserver-5.8.18.ebuild 862
-SHA256 30a5b19a287e6f4898dc5e491e2ffcb97ea4a12018e64cc94208ad15ccc3618d irtrans-irserver-5.8.18.ebuild 862
-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
-MD5 b1439f2abed9a4dad82a0a717db6b873 files/digest-irtrans-irserver-5.8.18 259
-RMD160 69324f3ca1f08b09a774d43a068a6e2e9a16018c files/digest-irtrans-irserver-5.8.18 259
-SHA256 56f2234d41675bacb26eca55fd70c30efd265f796fb6f00f2facbfb9abcad47e files/digest-irtrans-irserver-5.8.18 259
+EBUILD irtrans-irserver-5.8.18-r1.ebuild 1051 RMD160 38971585be2282d33ceeca1afa242ae2257987be SHA1 e8231d060e4fbd5c30f2e472732862ce69fefb31 SHA256 9d0922a2320e622091014ae36c764128bc04ef039573363ab593620392c9c75c
+MD5 cc6dbb7d75d2baf427421ef1f177b9c6 irtrans-irserver-5.8.18-r1.ebuild 1051
+RMD160 38971585be2282d33ceeca1afa242ae2257987be irtrans-irserver-5.8.18-r1.ebuild 1051
+SHA256 9d0922a2320e622091014ae36c764128bc04ef039573363ab593620392c9c75c irtrans-irserver-5.8.18-r1.ebuild 1051
+MISC ChangeLog 329 RMD160 dc8f1f03c25f693f0ad88d5c26cba0d467d98aac SHA1 b8e858a2163a8747fbd9b359e67dece85b035e4d SHA256 9c3d2eb201fbe0fbd5eeccc2c118d8440d90fbbe80e937b7518aebeace3e09d4
+MD5 b5324221b96bd43d1049a68781bb1205 ChangeLog 329
+RMD160 dc8f1f03c25f693f0ad88d5c26cba0d467d98aac ChangeLog 329
+SHA256 9c3d2eb201fbe0fbd5eeccc2c118d8440d90fbbe80e937b7518aebeace3e09d4 ChangeLog 329
+MD5 b1439f2abed9a4dad82a0a717db6b873 files/digest-irtrans-irserver-5.8.18-r1 259
+RMD160 69324f3ca1f08b09a774d43a068a6e2e9a16018c files/digest-irtrans-irserver-5.8.18-r1 259
+SHA256 56f2234d41675bacb26eca55fd70c30efd265f796fb6f00f2facbfb9abcad47e files/digest-irtrans-irserver-5.8.18-r1 259
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
deleted file mode 100644
index 842e5793..00000000
--- a/app-misc/irtrans-irserver/files/digest-irtrans-irserver-5.8.04
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-irtrans-irserver-5.8.18-r1 b/app-misc/irtrans-irserver/files/digest-irtrans-irserver-5.8.18-r1
new file mode 100644
index 00000000..cfffe3ca
--- /dev/null
+++ b/app-misc/irtrans-irserver/files/digest-irtrans-irserver-5.8.18-r1
@@ -0,0 +1,3 @@
+MD5 d782a719daf4cecad32f6060f53975fb irserver-src-5.8.18.tar.gz 123837
+RMD160 18e5d86c4efab6a744c947a2ef4cf7dbfb45c716 irserver-src-5.8.18.tar.gz 123837
+SHA256 d98a730d273a95803ef71b6b8e60cf38bec86de2a84c7af9909dc0a7c868280d irserver-src-5.8.18.tar.gz 123837
diff --git a/app-misc/irtrans-irserver/files/irtrans-server.initd b/app-misc/irtrans-irserver/files/irtrans-server.initd
index 1df33186..e2e42363 100755
--- a/app-misc/irtrans-irserver/files/irtrans-server.initd
+++ b/app-misc/irtrans-irserver/files/irtrans-server.initd
@@ -10,7 +10,7 @@ depend() {
 
 start() {
 	ebegin "Starting IRTrans"
-	eval start-stop-daemon --start --quiet --exec /usr/bin/irserver --pidfile /var/run/irtrans-irserver.pid \
+	eval start-stop-daemon --start --quiet --exec /usr/sbin/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.04.ebuild b/app-misc/irtrans-irserver/irtrans-irserver-5.8.04.ebuild
deleted file mode 100644
index 1b686cb6..00000000
--- a/app-misc/irtrans-irserver/irtrans-irserver-5.8.04.ebuild
+++ /dev/null
@@ -1,41 +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
-
-DESCRIPTION="IRTrans Server"
-HOMEPAGE="http://www.irtrans.de" 
-SRC_URI="http://www.irtrans.de/download/Server/Linux/irserver-src.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-
-RDEPEND="virtual/libc"
-
-RESTRICT="mirror 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() {
-	dobin ${WORKDIR}/irserver
-
-	keepdir /etc/irserver/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.18.ebuild b/app-misc/irtrans-irserver/irtrans-irserver-5.8.18-r1.ebuild
similarity index 63%
rename from app-misc/irtrans-irserver/irtrans-irserver-5.8.18.ebuild
rename to app-misc/irtrans-irserver/irtrans-irserver-5.8.18-r1.ebuild
index 480dac53..e350f91c 100644
--- a/app-misc/irtrans-irserver/irtrans-irserver-5.8.18.ebuild
+++ b/app-misc/irtrans-irserver/irtrans-irserver-5.8.18-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs multilib
 
 DESCRIPTION="IRTrans Server"
 HOMEPAGE="http://www.irtrans.de" 
@@ -10,8 +10,8 @@ SRC_URI="ftp://mars.arge.at/irtrans/irserver-src-${PV}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="~x86 ~amd64"
+IUSE="x86"
 
 DEPEND=""
 
@@ -25,13 +25,19 @@ src_unpack() {
 
 src_compile() { 
 	cd ${WORKDIR}
-	append-flags -m32 -DLINUX -Icommon
+	append-flags -DLINUX -Icommon
+	if use x86 || ( has_multilib_profile && ABI="x86" ) ; then
+            irbuild=irserver
+	    append-flags -m32
+        else
+            irbuild=irserver_noccf	
+        fi
 	einfo "CFLAGS=\"${CFLAGS}\""
-	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" irserver || die "emake irserver failed"
+	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ${irbuild} || die "emake irserver failed"
  }
 
 src_install() {
-	dobin ${WORKDIR}/irserver
+	dosbin ${WORKDIR}/irserver
 
 	keepdir /etc/irserver/remotes