diff --git a/app-misc/irtrans-irclient/Manifest b/app-misc/irtrans-irclient/Manifest
index c37db6aa..cedd9292 100644
--- a/app-misc/irtrans-irclient/Manifest
+++ b/app-misc/irtrans-irclient/Manifest
@@ -1,12 +1,12 @@
-AUX irtrans-irserver-5.9.01-missing-include.diff 954 RMD160 a4b292a46b17ad9d4a89ec352969c69fe0987eca SHA1 73ba42bb27ba295020a98b0bbdf9baf25ee1649a SHA256 4158080daeb4bc0c39d080d5c77e161bf63109edd93e5abd656ea8b56f08a829
-MD5 5349a67931284457d4bb192a29ee9557 files/irtrans-irserver-5.9.01-missing-include.diff 954
-RMD160 a4b292a46b17ad9d4a89ec352969c69fe0987eca files/irtrans-irserver-5.9.01-missing-include.diff 954
-SHA256 4158080daeb4bc0c39d080d5c77e161bf63109edd93e5abd656ea8b56f08a829 files/irtrans-irserver-5.9.01-missing-include.diff 954
+AUX irtrans-irclient-5.9.01-missing-include.diff 641 RMD160 b55d703d62c74b53ff9c94186612e12446b473cb SHA1 c18eeef23aa0750c295bd86ec62a75b0844dee7f SHA256 476ed8874124caba965192755f074aee6644af4319dabff27b0a339b1f3e4354
+MD5 a8f8f0409c09e2a2766cb7785652a2b5 files/irtrans-irclient-5.9.01-missing-include.diff 641
+RMD160 b55d703d62c74b53ff9c94186612e12446b473cb files/irtrans-irclient-5.9.01-missing-include.diff 641
+SHA256 476ed8874124caba965192755f074aee6644af4319dabff27b0a339b1f3e4354 files/irtrans-irclient-5.9.01-missing-include.diff 641
 DIST irserver-src-5.9.01.tar.gz 131750 RMD160 16373378b0eb8d126faf81f8afa9c62c46f9b7e6 SHA1 e03916231f5cb4247c3428906ad37bfa7eba1629 SHA256 90491893f93f952a85d6db39a7700be562156bd6510cee16c1432bf6c93a7ff4
-EBUILD irtrans-irclient-5.9.01.ebuild 872 RMD160 7dbd5760369c6b1e4adb36d4d27141dd2bf435bd SHA1 657bf597dfe6ee7ac6c4e93dd48cba845be410f7 SHA256 dd098820de2b6cf8e42890926821f76c1badfd43a5a8d85280f0d061e5df3297
-MD5 3b3a4f9f245f52e29b693a60675fcb00 irtrans-irclient-5.9.01.ebuild 872
-RMD160 7dbd5760369c6b1e4adb36d4d27141dd2bf435bd irtrans-irclient-5.9.01.ebuild 872
-SHA256 dd098820de2b6cf8e42890926821f76c1badfd43a5a8d85280f0d061e5df3297 irtrans-irclient-5.9.01.ebuild 872
+EBUILD irtrans-irclient-5.9.01.ebuild 855 RMD160 c2c48119a8755b0a0292be1d8702ade2f804f6c1 SHA1 35e113656f19e40c7731734681a749eed53c5c45 SHA256 7289affdc8f1b55cf1e3cb691c5650bbbdf701864cc4abdd55330088b5bf43e0
+MD5 d3508ff5c1b1afaa3932ae3e68b0041a irtrans-irclient-5.9.01.ebuild 855
+RMD160 c2c48119a8755b0a0292be1d8702ade2f804f6c1 irtrans-irclient-5.9.01.ebuild 855
+SHA256 7289affdc8f1b55cf1e3cb691c5650bbbdf701864cc4abdd55330088b5bf43e0 irtrans-irclient-5.9.01.ebuild 855
 MISC ChangeLog 397 RMD160 128f263807df06384a441baaf4bdbd8db0769ab1 SHA1 78e27e8a37b0f1cc9abedf96ddead7ae0c4314d1 SHA256 0c088e13d7c750c55f39eaa636e297e4b70eb398d7988edee2e571de0bc9e045
 MD5 a5ca18f848c4538760eae16f556e9519 ChangeLog 397
 RMD160 128f263807df06384a441baaf4bdbd8db0769ab1 ChangeLog 397
diff --git a/app-misc/irtrans-irclient/files/irtrans-irserver-5.9.01-missing-include.diff b/app-misc/irtrans-irclient/files/irtrans-irclient-5.9.01-missing-include.diff
similarity index 67%
rename from app-misc/irtrans-irclient/files/irtrans-irserver-5.9.01-missing-include.diff
rename to app-misc/irtrans-irclient/files/irtrans-irclient-5.9.01-missing-include.diff
index a950bfaa..e2200f99 100644
--- a/app-misc/irtrans-irclient/files/irtrans-irserver-5.9.01-missing-include.diff
+++ b/app-misc/irtrans-irclient/files/irtrans-irclient-5.9.01-missing-include.diff
@@ -1,17 +1,5 @@
 Joerg Bornkessel <hd_brummy@gentoo.org> 16 Aug 2007
 
-diff -Naur linuxserio.c.orig linuxserio.c
---- linuxserio.c.orig   2007-08-16 12:24:22.000000000 +0200
-+++ linuxserio.c    2007-08-16 12:24:49.000000000 +0200
-@@ -13,6 +13,7 @@
- #include <netinet/in.h>
- #include <sys/un.h>
- #include <arpa/inet.h>
-+#include <stdlib.h>
-
- #include "remote.h"
- #include "errcode.h"
- 
 diff -Naur client.c.orig client.c
 --- client.c.orig	2007-08-16 15:34:20.000000000 +0200
 +++ client.c	2007-08-16 15:34:53.000000000 +0200
diff --git a/app-misc/irtrans-irclient/irtrans-irclient-5.9.01.ebuild b/app-misc/irtrans-irclient/irtrans-irclient-5.9.01.ebuild
index 597fb946..8678c073 100644
--- a/app-misc/irtrans-irclient/irtrans-irclient-5.9.01.ebuild
+++ b/app-misc/irtrans-irclient/irtrans-irclient-5.9.01.ebuild
@@ -22,14 +22,14 @@ RESTRICT="mirror"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/irtrans-irserver-${PV}-missing-include.diff
+	epatch ${FILESDIR}/${P}-missing-include.diff
 }
 
 src_compile() { 
 	cd ${WORKDIR}
 	append-flags -DLINUX -Icommon
 	$(tc-getCC) ${CFLAGS} -o irclient  client.c || die "irclient compile failed"
-	$(tc-getCC) ${CFLAGS} -o ip_assign  ip_assign.c || die "irclient compile failed"
+	$(tc-getCC) ${CFLAGS} -o ip_assign  ip_assign.c || die "ip_assign compile failed"
  }
 
 src_install() {
diff --git a/app-misc/irtrans-irserver/Manifest b/app-misc/irtrans-irserver/Manifest
index 4da5962e..7279975d 100644
--- a/app-misc/irtrans-irserver/Manifest
+++ b/app-misc/irtrans-irserver/Manifest
@@ -1,7 +1,7 @@
-AUX irtrans-irserver-5.9.01-missing-include.diff 954 RMD160 a4b292a46b17ad9d4a89ec352969c69fe0987eca SHA1 73ba42bb27ba295020a98b0bbdf9baf25ee1649a SHA256 4158080daeb4bc0c39d080d5c77e161bf63109edd93e5abd656ea8b56f08a829
-MD5 5349a67931284457d4bb192a29ee9557 files/irtrans-irserver-5.9.01-missing-include.diff 954
-RMD160 a4b292a46b17ad9d4a89ec352969c69fe0987eca files/irtrans-irserver-5.9.01-missing-include.diff 954
-SHA256 4158080daeb4bc0c39d080d5c77e161bf63109edd93e5abd656ea8b56f08a829 files/irtrans-irserver-5.9.01-missing-include.diff 954
+AUX irtrans-irserver-5.9.01-missing-include.diff 366 RMD160 18b9c6b33a0b0cf7d9301afaf6a193c1b2e0801f SHA1 6ddcd719d5c0372eb78e85093bb6e0416f636b25 SHA256 289ff6ce4cf7b5c9a43546722342bd621291f632611cb674ed95805bb1f38d1e
+MD5 ba5c6cd57f327d379106837fcb212851 files/irtrans-irserver-5.9.01-missing-include.diff 366
+RMD160 18b9c6b33a0b0cf7d9301afaf6a193c1b2e0801f files/irtrans-irserver-5.9.01-missing-include.diff 366
+SHA256 289ff6ce4cf7b5c9a43546722342bd621291f632611cb674ed95805bb1f38d1e files/irtrans-irserver-5.9.01-missing-include.diff 366
 AUX irtrans-server.confd 355 RMD160 c89748d87eb9d3a3a4d798e7f5dfce53a3c6838e SHA1 63913bf4545727c7211ce7fe84bf97e780c40a77 SHA256 2cb95a869c3932b4092e1981bd286ab6cf936569f46cbf14c0c75832f91afef8
 MD5 0e2f5c538691663434642cec028b1296 files/irtrans-server.confd 355
 RMD160 c89748d87eb9d3a3a4d798e7f5dfce53a3c6838e files/irtrans-server.confd 355
diff --git a/app-misc/irtrans-irserver/files/irtrans-irserver-5.9.01-missing-include.diff b/app-misc/irtrans-irserver/files/irtrans-irserver-5.9.01-missing-include.diff
index a950bfaa..38b4f989 100644
--- a/app-misc/irtrans-irserver/files/irtrans-irserver-5.9.01-missing-include.diff
+++ b/app-misc/irtrans-irserver/files/irtrans-irserver-5.9.01-missing-include.diff
@@ -12,25 +12,3 @@ diff -Naur linuxserio.c.orig linuxserio.c
  #include "remote.h"
  #include "errcode.h"
  
-diff -Naur client.c.orig client.c
---- client.c.orig	2007-08-16 15:34:20.000000000 +0200
-+++ client.c	2007-08-16 15:34:53.000000000 +0200
-@@ -14,6 +14,7 @@
- #include <errno.h>
- #include <netdb.h>
- #include <signal.h>
-+#include <stdlib.h>
- typedef int SOCKET;
- typedef void* WSAEVENT;
- #define closesocket close
-diff -Naur ip_assign.c.orig ip_assign.c
---- ip_assign.c.orig	2007-08-16 17:59:33.000000000 +0200
-+++ ip_assign.c	2007-08-16 18:01:17.000000000 +0200
-@@ -17,6 +17,7 @@
- #include <stdio.h>
- #include <net/if.h>
- #include <sys/ioctl.h>
-+#include <stdlib.h>
- 
- 
- typedef int SOCKET;