diff --git a/app-misc/irtrans-irserver/ChangeLog b/app-misc/irtrans-irserver/ChangeLog
index 0f679c91..d652806b 100644
--- a/app-misc/irtrans-irserver/ChangeLog
+++ b/app-misc/irtrans-irserver/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for app-misc/irtrans-irserver
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*irtrans-irserver-6.09.04 (15 Oct 2012)
+
+  15 Oct 2012; Mario Fetka <mario.fetka@gmail.com>
+  +irtrans-irserver-6.09.04.ebuild:
+  Bump
+
   19 Nov 2011; Mario Fetka <mario.fetka@gmail.com>
   -irtrans-irserver-6.03.02.ebuild, -irtrans-irserver-6.03.08.ebuild,
   -irtrans-irserver-6.03.09.ebuild, -irtrans-irserver-6.08.18.ebuild,
diff --git a/app-misc/irtrans-irserver/Manifest b/app-misc/irtrans-irserver/Manifest
index eb0cdb20..6d6c4d03 100644
--- a/app-misc/irtrans-irserver/Manifest
+++ b/app-misc/irtrans-irserver/Manifest
@@ -1,6 +1,9 @@
-AUX irtrans-server.confd 405 RMD160 62e625c8b765172022f16fc75b3dfb0a4a4f5ac5 SHA1 3d930b04b22505bf375d45a896c9a03a84190111 SHA256 7b1030bd35308193ef8bca4a2b0420e1aa102eeaaba37e6ad6186e44fe36a584
-AUX irtrans-server.initd 576 RMD160 c799c35b549e8ab75a4551696d02e17bf8df5ef8 SHA1 4408dece820ac61c827f6171d5008cac0ffe3a03 SHA256 947e0e42450eea0c33b9e183e7d1ab4b70458782b1d9646b40858d7f6d9c639a
-DIST irserver-src-6.08.28.tar.gz 195695 RMD160 d6f9888284507e462e80a0dbe52cdcf3b5cd873c SHA1 7b67ecb73fd9bbedf1c954aef889f3989ff88cda SHA256 375a567f760e8afd02b749b9624499d19233c3e3ed1d64ebf863e192f0181575
-EBUILD irtrans-irserver-6.08.28.ebuild 1481 RMD160 af8f259b628118d1a3b624bf6febad575483a9e2 SHA1 988f5d6878d6cfba2b321c9e848a927dd4658540 SHA256 4dc635ed386efbf5bab99ca57f828ab4301222ebc4dcde6cc30c698ca12cc452
-MISC ChangeLog 5533 RMD160 b3714385c4af90d0bb22328134c35ccb5b9ae859 SHA1 6a7498a65539f199a190407d4ebaa44923fc30bb SHA256 32cc34762b262da8804bb06b38d59e276d918756642bb9636d6d9d5304261768
-MISC metadata.xml 205 RMD160 f85e91d792c694cb3e45fac26295dba0e6e43786 SHA1 3f13c3b49579342e2308323aa3dda2f43dd94c23 SHA256 9fdfc9c91107d94feb8416adc2cec7734fa27084bff83ea859938b3216e028bc
+AUX irtrans-server.confd 405 SHA256 7b1030bd35308193ef8bca4a2b0420e1aa102eeaaba37e6ad6186e44fe36a584 SHA512 1de71558faf723b6f2b8b133f81d20addc7c0775e3859307a78e1ae41bd9fb122ccc43f483d7e9e33cb21de611e283246562e1a8d1cd3d6cfd9d1a3002b8593b WHIRLPOOL ea7faabce49e0a819686d092548c1b349ab47edc2ae48cd18ffe42441a7a4937e90da8d241c1ba9c20aeb3d55e3cc796be76747395a7d505588a74716763b360
+AUX irtrans-server.initd 576 SHA256 947e0e42450eea0c33b9e183e7d1ab4b70458782b1d9646b40858d7f6d9c639a SHA512 8a22400ada008775c10c136f9913ad4d6bee833808d29034ec37b47e609509909cf9df3d7c08858a9a8d245363997fbeab04778c14c1e15ba74c785dd225bd2d WHIRLPOOL 8e5eec4838ae8857c2b621f93da04a6f3e1a0bbdb3b6667923c6f4db176265516a92f2bbbff0dd12e3a4defcd0a55e27a57ef37a213fd66d1c92dfc3f8c0c4b8
+DIST irserver-6.09.04.tar.gz 665809 SHA256 ad7d8d42afef595a596c086d5df496fabe788147e26b15a8ec43e814583cffb1 SHA512 d63f8bc79c2a5a8050c5ac21b086be3826f66102dc2f111bf8084b57756c6bcd84615d1675781b26520c34f7a3e08726dbc4ae94dd4f4afc446383597c433399 WHIRLPOOL b9389b4c316d481ff9434501c38009e667ff560dd88a69d27dcb6e577a715439d7c62f1764e2cc5879b9e069d5f07e4ca8454d4c28397bb32c2b67db20598213
+DIST irserver-src-6.08.28.tar.gz 195695 SHA256 375a567f760e8afd02b749b9624499d19233c3e3ed1d64ebf863e192f0181575
+DIST irserver-src-6.09.04.tar.gz 200481 SHA256 0ce8baa3216d0c45bec0fb8384363c5a4ae93b384654d758373f912648ffb930 SHA512 09c38066e64404808856a89a8451e41a6eb8a51b98635b1515fc07050f25b4552b9cc912bd9612c6746ba67cd9b1bb45f3d4871dfa820c9e9bd810ede20f28d6 WHIRLPOOL 2fff3f6a24f6d74efc98a5ad818c6a098f176e97df9d0a8be3ac89109c71350a4ba88feb4b78ca947dab6bf515c29d86b5c61cdf9523dc13bc2782697a2d8fae
+EBUILD irtrans-irserver-6.08.28.ebuild 1481 SHA256 4dc635ed386efbf5bab99ca57f828ab4301222ebc4dcde6cc30c698ca12cc452 SHA512 b469e876b7b9de0e2314aa4754cefb1e7aa40ecfc0412276cfedcb52e1e777bd84b2fee689d41e8b8351d02df63c64847c21d104575fb8ace8fcafd031241443 WHIRLPOOL e06a9d7876c53f6d126c3fb7795426d18fcc7cefc278008e1ae7f9cb6e85f8f92901d39f0685d96299313caf9971dca0bb67cd7a391ee7f55d94b5023818f0de
+EBUILD irtrans-irserver-6.09.04.ebuild 2021 SHA256 a238afbb05aa0e28df1e51d53c33839cfe7eac1700cc0bf9e83cdd3e7cd98886 SHA512 53566960025dd806458573e5ff564bb1bacb2903f91505e395209378c7b92d1fae24e7eee2b086847e85274df1c47ca85fe41a2a3c5e41cdce0c793935a48950 WHIRLPOOL 71a36a156f5e99a7b4ed3ab812526dd1f658bfc555b1781ebeed037b61a45cd48ea06bfd559dcb9b8b0cc5e404e6ad8b84d6831914fe281691bcd39a247bbf3a
+MISC ChangeLog 5669 SHA256 4f9b1e7b24649fb2dc86cf5c106484a19c55f48617e9ed8e323bc1843a767654 SHA512 4cf07b7b1643793b3428f151907cc4a638af148f7e36eedda43bfdf02659c31cb7048c28b41ea23ea938120cf690247af1aaef191f50f75a9d48feb94a851c65 WHIRLPOOL 375b3333d1c3e64ce2d7e4242d0ea8dfecc5ee366472a8923e67326ea7a0a3d93f1de07f74e410ff70ef4ed71848274b87037ad0165162bb08041057d91ca9da
+MISC metadata.xml 205 SHA256 9fdfc9c91107d94feb8416adc2cec7734fa27084bff83ea859938b3216e028bc SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b WHIRLPOOL 779e2cb116b19389f70acc6d49694358619116f9849f3b8e46f00df4e39b4476424b20990b9dabb4ba16605d1894d6b820eaeb930401d825265bfdca27f6fb96
diff --git a/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild b/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild
new file mode 100644
index 00000000..8208251b
--- /dev/null
+++ b/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs mono multilib
+
+RESTRICT="strip"
+
+DESCRIPTION="IRTrans Server"
+HOMEPAGE="http://www.irtrans.de"
+SRC_URI="http://www.irtrans.de/download/Server/Linux/irserver-src.tar.gz -> irserver-src-${PV}.tar.gz
+	http://www.irtrans.de/download/Server/Linux/irserver.tar.gz -> irserver-${PV}.tar.gz
+	http://ftp.disconnected-by-peer.at/irtrans/irserver-src-${PV}.tar.gz
+	http://ftp.disconnected-by-peer.at/irtrans/irserver-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~arm"
+IUSE="mono"
+
+DEPEND=""
+RDEPEND="mono? ( >=dev-lang/mono-2.10.5 )
+	${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	sed -e 's!^ODIRARM = .*!ODIRARM = n800!' -i makefile
+}
+
+src_compile() {
+
+	append-flags -DLINUX
+
+	# Set sane defaults (arm target has no -D flags added)
+	irbuild=irserver_arm_noccf
+	irserver=irserver
+
+	# change variable by need
+	if use x86 ; then
+		irbuild=irserver
+	elif use amd64 ; then
+		irbuild=irserver64
+		irserver=irserver64
+	elif use arm ; then
+		irbuild=irserver_arm
+	fi
+
+	# Some output for bugreport
+	einfo "CFLAGS=\"${CFLAGS}\""
+	einfo "Build Target=\"${irbuild}\""
+	einfo "Build Binary=\"${irserver}\""
+
+	# Build
+	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" "${irbuild}" || die "emake irserver failed"
+}
+
+src_install() {
+
+	newbin "${WORKDIR}/${irserver}" irserver
+
+	keepdir /etc/irserver/remotes
+
+	docinto remotes
+	dodoc remotes/*
+
+	newinitd "${FILESDIR}"/irtrans-server.initd irtrans-server
+	newconfd "${FILESDIR}"/irtrans-server.confd irtrans-server
+
+	if use mono ; then
+		# Wrapper script to launch mono
+		make_wrapper irguiclient "mono /usr/$(get_libdir)/${PN}/GUIClient.exe"
+
+		insinto /usr/$(get_libdir)/${PN}/
+		exeinto /usr/$(get_libdir)/${PN}/
+
+		# The Libs and Translations
+		doins GUIClient/*.tra
+		doexe GUIClient/*.dll
+
+		# The actual executable
+		doexe GUIClient/*.exe
+	fi
+
+}