diff --git a/net-misc/nxcompshad/ChangeLog b/net-misc/nxcompshad/ChangeLog
new file mode 100644
index 00000000..7bc8cec9
--- /dev/null
+++ b/net-misc/nxcompshad/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for net-misc/nxcompshad
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  14 Jun 2010; Mario Fetka <mario.fetka@gmail.com>
+  +files/nxcompshad-3.2.0-gcc43.patch, +files/nxcompshad-3.3.0-Xext.patch,
+  +nxcompshad-3.4.0_p3.ebuild, +files/nxcompshad-3.4.0-cflags.patch,
+  +files/nxcompshad-3.4.0-system_wide_build.patch, +metadata.xml:
+  Initial checkin
+
diff --git a/net-misc/nxcompshad/Manifest b/net-misc/nxcompshad/Manifest
new file mode 100644
index 00000000..d2cf59c5
--- /dev/null
+++ b/net-misc/nxcompshad/Manifest
@@ -0,0 +1,8 @@
+AUX nxcompshad-3.2.0-gcc43.patch 250 RMD160 564f24227cb1cfa26d6de5c872ea5341adf8bc96 SHA1 d3e9e94e925daafa367657c1ad8ee3bc1e27618a SHA256 035180ebc213e9503f2f8ef0cd4109b0dfb30e423410e6733931d0a5dc0c02be
+AUX nxcompshad-3.3.0-Xext.patch 318 RMD160 a1278bcefc66cee3df23bd4e9ece91975fe5b544 SHA1 80da3ac7435647cae5f63943e59a11b92e0ce89a SHA256 84bd4dcbe874be68da537b7b0cbdcb86cd33700f07d3dbb6d11919f09c933ea0
+AUX nxcompshad-3.4.0-cflags.patch 445 RMD160 5d0910425a04052ff0efd6ca52e99a98a5772827 SHA1 26a886dbdf63a0d961a8edafcba9c197245b2e7f SHA256 9b63d3049a36ee85b7d0abad5c9578846cca1d4620b2acb6dc0fe36293ff27f6
+AUX nxcompshad-3.4.0-system_wide_build.patch 695 RMD160 8b0355fdc09acceacf162d02d914b7e1c0b8c525 SHA1 6262a74ccdbd5b68ac427af1b8f5b9483aa26e60 SHA256 741c13e9e7aa5d2f5bc78a6de50705c44c3d2f66a5e63afecfa5891c378e010a
+DIST nxcompshad-3.4.0-3.tar.gz 77220 RMD160 861366ef776aa71fcfdba25ae21e8ece135ad8fc SHA1 93df71868b7eb74cb9fae9f4f8b9630e51f8191a SHA256 8c5a67ea156afb0fb2a50adbb89b8b26b6f0860cf3f53c45eb53f59ec4deaa98
+EBUILD nxcompshad-3.4.0_p3.ebuild 1232 RMD160 b82a3beff1db0356d5d2ad794b8d4d8c2058a18e SHA1 a495c8c37796f95ba6a2cdd500970de53e555b67 SHA256 c6a4cc08035c6e5e2988472ef6455184ef688a4f3c3c8c52a820ca384a14b865
+MISC ChangeLog 400 RMD160 427a1dc715737cb7767bd956b51f870354d90a7e SHA1 dfb9e92ccaf914f481e9bdd99d164ef6b42813ec SHA256 b0bfce592615f0bf6e64a14066546ac4bb7dde6228fe4de410adf8d93568e952
+MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/net-misc/nxcompshad/files/nxcompshad-3.2.0-gcc43.patch b/net-misc/nxcompshad/files/nxcompshad-3.2.0-gcc43.patch
new file mode 100644
index 00000000..e5a2c93a
--- /dev/null
+++ b/net-misc/nxcompshad/files/nxcompshad-3.2.0-gcc43.patch
@@ -0,0 +1,13 @@
+--- nxcompshad/Misc.h.orig	2008-07-21 18:27:41 +0400
++++ nxcompshad/Misc.h	2008-07-21 18:31:17 +0400
+@@ -20,8 +20,8 @@
+ 
+ #include <iostream>
+ 
+-#include <errno.h>
+-#include <string.h>
++#include <cerrno>
++#include <cstring>
+ 
+ using namespace std;
+ 
diff --git a/net-misc/nxcompshad/files/nxcompshad-3.3.0-Xext.patch b/net-misc/nxcompshad/files/nxcompshad-3.3.0-Xext.patch
new file mode 100644
index 00000000..109619ec
--- /dev/null
+++ b/net-misc/nxcompshad/files/nxcompshad-3.3.0-Xext.patch
@@ -0,0 +1,11 @@
+--- nxcompshad/Makefile.in.orig	2008-12-05 13:57:18 +0300
++++ nxcompshad/Makefile.in	2008-12-05 13:57:05 +0300
+@@ -48,7 +48,7 @@ CCINCLUDES  =
+ CCDEFINES   =
+ 
+ LDFLAGS     = @LDFLAGS@
+-LIBS        = @LIBS@ -L/usr/X11R6/lib -lX11
++LIBS        = @LIBS@ -L/usr/X11R6/lib -lX11 -lXext
+ 
+ #
+ # Only if THREADS is defined.
diff --git a/net-misc/nxcompshad/files/nxcompshad-3.4.0-cflags.patch b/net-misc/nxcompshad/files/nxcompshad-3.4.0-cflags.patch
new file mode 100644
index 00000000..3dcf4baa
--- /dev/null
+++ b/net-misc/nxcompshad/files/nxcompshad-3.4.0-cflags.patch
@@ -0,0 +1,21 @@
+Title: Remove hardcoded O3 compiler flag
+DEP: 3
+State: CANDIDATE
+Date: 2009-12-19
+Abstract:
+ Remove hardcoded O3 compiler flag
+
+--- nxcompshad/configure.in.orig	2008-12-18 15:56:13.000000000 +0100
++++ nxcompshad/configure.in	2008-12-18 15:56:22.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Shadow.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
diff --git a/net-misc/nxcompshad/files/nxcompshad-3.4.0-system_wide_build.patch b/net-misc/nxcompshad/files/nxcompshad-3.4.0-system_wide_build.patch
new file mode 100644
index 00000000..39f7ceb0
--- /dev/null
+++ b/net-misc/nxcompshad/files/nxcompshad-3.4.0-system_wide_build.patch
@@ -0,0 +1,22 @@
+Title: Include headers from system directory
+DEP: 3
+State: CANDIDATE
+Abstract:
+ Include headers from system directory
+
+diff -urNad nxcompshad~/configure.in nxcompshad/configure.in
+--- nxcompshad~/configure.in	2007-06-04 13:39:49.000000000 +0200
++++ nxcompshad/configure.in		2008-06-18 10:00:00.000000000 +0200
+@@ -17,9 +17,9 @@
+ 
+ dnl Prefer headers and libraries from nx-X11, if present.
+ 
+-if test -d "../nx-X11/exports/include" ; then
+-    CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include"
+-    LIBS="$LIBS -L../nx-X11/exports/lib"
++if test -d "/usr/include/nx" ; then
++    CXXFLAGS="$CXXFLAGS -I/usr/include/nx"
++    LIBS="$LIBS -L/usr/lib/nx"
+ fi
+ 
+ dnl Check whether --with-ipaq was given.
diff --git a/net-misc/nxcompshad/metadata.xml b/net-misc/nxcompshad/metadata.xml
new file mode 100644
index 00000000..46a44e57
--- /dev/null
+++ b/net-misc/nxcompshad/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!-- 
+$Header: /var/cvsroot/gentoo-x86/skel.metadata.xml,v 1.18 2008/07/28 19:27:05 cardoe Exp $
+
+This is the example metadata file.
+The root element of this file is <pkgmetadata>. Within this element a 
+number of subelements are allowed: herd, maintainer, and 
+longdescription. herd is a required subelement.
+
+For a full description look at:
+http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml?part=2&chap=4
+
+
+Before committing, please remove the comments from this file. They are 
+not relevant for general metadata.xml files.
+-->
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>@gentoo.org</email>
+<!--  <description>Description of the maintainership</description> -->
+</maintainer>
+<!-- <longdescription>Long description of the package</longdescription> -->
+<!--
+<use>
+  <flag name='flag'>Description of how USE='flag' affects this package</flag>
+  <flag name='userland_GNU'>Description of how USERLAND='GNU' affects this
+	  package</flag>
+  <flag name='aspell'>Uses <pkg>app-text/aspell</pkg> for spell checking.
+	  Requires an installed dictionary from <cat>app-dicts</cat></flag>
+</use>
+-->
+</pkgmetadata>
diff --git a/net-misc/nxcompshad/nxcompshad-3.4.0_p3.ebuild b/net-misc/nxcompshad/nxcompshad-3.4.0_p3.ebuild
new file mode 100644
index 00000000..2ca58b07
--- /dev/null
+++ b/net-misc/nxcompshad/nxcompshad-3.4.0_p3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+MY_P=${P/_p/-}
+MY_PV=${PV/_p*/}
+
+inherit autotools eutils multilib
+
+DESCRIPTION="NX compression technology core libraries"
+HOMEPAGE="http://www.nomachine.com/developers.php"
+SRC_URI="http://web04.nomachine.com/download/${MY_PV}/sources/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	>=media-libs/jpeg-6b-r4
+	>=media-libs/libpng-1.2.8
+	>=sys-libs/zlib-1.2.3
+	!<=net-misc/nx-${MY_PV}
+	>=net-misc/nxcomp-${MY_PV}"
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/nxcompshad
+
+src_prepare() {
+	# Respect CFLAGS/CXXFLAGS
+	epatch "${FILESDIR}"/nxcompshad-3.4.0-cflags.patch
+	# Use System nxcomp
+	epatch "${FILESDIR}"/nxcompshad-3.4.0-system_wide_build.patch
+	# Gcc 4.3 build problem
+	epatch "${FILESDIR}"/nxcompshad-3.2.0-gcc43.patch
+	# link with xext
+	epatch "${FILESDIR}"/nxcompshad-3.3.0-Xext.patch
+	# Run autoreconf in all neeed folders
+	eautoreconf
+}
+
+src_install() {
+	# Install Libs
+	dolib libXcompshad.a
+	dolib.so libXcompshad.so*
+	# Install Header
+	insinto /usr/include/nx
+	doins *.h
+}