diff --git a/package/avm/nx-X11/gcc34.diff b/package/avm/nx-X11/gcc34.diff
new file mode 100644
index 000000000..e22de6747
--- /dev/null
+++ b/package/avm/nx-X11/gcc34.diff
@@ -0,0 +1,110 @@
+--- nxcomp/Types.h.orig	2004-08-10 10:47:11.000000000 +0200
++++ nxcomp/Types.h	2004-09-16 02:19:01.364333008 +0200
+@@ -74,22 +74,26 @@
+ 
+   void clear()
+   {
+-    #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
++    #if defined(_VECTOR_H) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
+ 
+-    #if defined(__GLIBCPP_INTERNAL_VECTOR_H)
++    #if defined(_VECTOR_H)
+ 
+-    _Destroy(_M_start, _M_finish);
++    _Destroy(_M_impl._M_start, _M_impl._M_finish);
+ 
+-    #else
++    _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start);
+ 
+-    destroy(_M_start, _M_finish);
++    _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0;
+ 
+-    #endif
++    #else
+ 
+     _M_deallocate(_M_start, _M_end_of_storage - _M_start);
+ 
+     _M_start = _M_finish = _M_end_of_storage = 0;
+ 
++    _Destroy(_M_start, _M_finish);
++
++    #endif
++
+     #else
+ 
+     destroy(start, finish);
+@@ -108,22 +112,28 @@
+ 
+   void clear()
+   {
+-    #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
++    #if defined(_VECTOR_H) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
+ 
+-    #if defined(__GLIBCPP_INTERNAL_VECTOR_H)
++    #if defined(_VECTOR_H)
+ 
+-    _Destroy(_M_start, _M_finish);
++    _Destroy(_M_impl._M_start, _M_impl._M_finish);
+ 
+-    #else
++    _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start);
+ 
+-    destroy(_M_start, _M_finish);
++    _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0;
+ 
+-    #endif
++    #else
+ 
+     _M_deallocate(_M_start, _M_end_of_storage - _M_start);
+ 
+     _M_start = _M_finish = _M_end_of_storage = 0;
+ 
++    _Destroy(_M_start, _M_finish);
++
++    #endif
++
++
++
+     #else
+ 
+     destroy(start, finish);
+--- nxcomp/Jpeg.cpp.orig	2004-09-13 03:41:49.905274168 +0200
++++ nxcomp/Jpeg.cpp	2004-09-13 03:43:06.886571232 +0200
+@@ -452,7 +452,7 @@
+     // next line.
+     //
+ 
+-    (char *) pixelPtr += RoundUp4(w * 2) - w * 2;
++    pixelPtr += RoundUp4(w * 2) - w * 2;
+ 
+     dy++;
+   }
+@@ -562,7 +562,7 @@
+       pixelPtr += 3;
+     }
+ 
+-    (char *) pixelPtr += RoundUp4(w * 3) - w * 3;
++    pixelPtr += RoundUp4(w * 3) - w * 3;
+ 
+     dy++;
+   }
+--- nxcomp/Png.cpp.orig	2004-09-13 03:43:18.138860624 +0200
++++ nxcomp/Png.cpp	2004-09-13 03:43:41.532304280 +0200
+@@ -452,7 +452,7 @@
+     // next line
+     //
+ 
+-    (char *) pixelPtr += RoundUp4(w * 2) - w * 2;
++    pixelPtr += RoundUp4(w * 2) - w * 2;
+   }
+ 
+   png_destroy_read_struct(&png_ptr, &info_ptr,NULL);
+@@ -578,7 +578,7 @@
+       pixelPtr += 3;
+     }
+ 
+-    (char *) pixelPtr += RoundUp4(w * 3) - w * 3;
++    pixelPtr += RoundUp4(w * 3) - w * 3;
+   }
+ 
+   png_destroy_read_struct(&png_ptr, &info_ptr,NULL);
diff --git a/package/avm/nx-X11/installinopt.patch b/package/avm/nx-X11/installinopt.patch
new file mode 100644
index 000000000..2b4c82c0c
--- /dev/null
+++ b/package/avm/nx-X11/installinopt.patch
@@ -0,0 +1,32 @@
+diff -ruN nx-X11/config/cf/site.def nx-X11-new/config/cf/site.def
+--- nx-X11/config/cf/site.def	2002-02-27 01:51:12.000000000 +0100
++++ nx-X11-new/config/cf/site.def	2004-03-25 13:12:17.926673776 +0100
+@@ -72,23 +72,25 @@
+ #ifdef AfterVendorCF
+ 
+ #ifndef ProjectRoot
+-#define ProjectRoot /usr/X11R6
++#define ProjectRoot /opt/nx
+ #endif
+ 
+ /*
+  * On some platforms, some things may be installed outside of ProjectRoot
+  * by default.  To disable this, uncomment the following line.
+  *
+-#define NothingOutsideProjectRoot YES
+  */
++#define NothingOutsideProjectRoot YES
++#define FontconfigFontsConfDir ProjectRoot/etc/fonts
++#define LinkGLToUsrInclude NO
+ 
+ /*
+  * Set EtcX11Directory if you want config file links installed under
+  * ProjectRoot rather than in /etc/X11.  See also HasVarDirectory,
+  * UseEtcX11 and UseSeparateConfDir.
+  *
+-#define EtcX11Directory ProjectRoot/etc
+  */
++#define EtcX11Directory ProjectRoot/etc
+ 
+ 
+ /* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */
diff --git a/package/avm/nx-X11/nx-X11.conf b/package/avm/nx-X11/nx-X11.conf
new file mode 100644
index 000000000..e26a474b3
--- /dev/null
+++ b/package/avm/nx-X11/nx-X11.conf
@@ -0,0 +1,54 @@
+prefix=opt/nx
+set_confopt
+
+nx-X11_prem() {
+	cd ..
+	
+	nxothersources="nxagent- nxauth- nxcomp- nxcompext- nxproxy-"
+	for nxsource in $nxothersources; do
+		nxsf=$(ls $archdir/${nxsource}*)
+		echo "Extracting $nxsf ($taropt) ..."
+		tar $taropt $nxsf
+# 		if [[ $nxsource = nxcomp- ]] ; then
+# 			patch -d nxcomp -p0 < $base/package/public/nxcomp/gcc34.patch
+# 		fi
+	done
+
+	cd $OLDPWD
+
+        echo "Configuring XFree ..."
+        cat >> config/cf/host.def << EOT
+/* Disable the internal zlib to use the system installed one */
+#define         HasZlib                 YES
+/* Disable the internal expat library to use the system installed one */
+#define         HasExpat                YES
+/* Less warnings with recent gccs ... */
+#define         DefaultCCOptions        -ansi GccWarningOptions
+
+EOT
+
+}
+
+nx-X11_postm() {
+# 	 echo "Installing nxcomp"
+# 	 cd ../nxcomp
+# 	 eval make $makeinstopt install
+# 	 cd $OLDPWD
+
+	 echo "Installing nxcompext"
+	 cd ../nxcompext
+	 eval make $makeinstopt install
+	 cd $OLDPWD
+
+# 	 echo "Installing nxproxy"
+# 	 cd ../nxproxy
+# 	 eval make $makeinstopt install
+# 	 cd $OLDPWD
+}
+
+hook_add premake 3 "nx-X11_prem"
+
+# They don't install anything?
+hook_add postmake 3 "nx-X11_postm"
+
+var_append makeopt " " "World"
diff --git a/package/avm/nx-X11/nx-X11.desc b/package/avm/nx-X11/nx-X11.desc
new file mode 100644
index 000000000..6b8a91696
--- /dev/null
+++ b/package/avm/nx-X11/nx-X11.desc
@@ -0,0 +1,48 @@
+
+[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+[COPY] 
+[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+[COPY] Please add additional copyright information _after_ the line containing
+[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+[COPY] 
+[COPY] ROCK Linux: rock-src/package/avm/nx-X11/nx-X11.desc
+[COPY] ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+[COPY] 
+[COPY] This program is free software; you can redistribute it and/or modify
+[COPY] it under the terms of the GNU General Public License as published by
+[COPY] the Free Software Foundation; either version 2 of the License, or
+[COPY] (at your option) any later version. A copy of the GNU General Public
+[COPY] License can be found at Documentation/COPYING.
+[COPY] 
+[COPY] Many people helped and are helping developing ROCK Linux. Please
+[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+[COPY] file for details.
+[COPY] 
+[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
+
+[I] An X11 server with integrated NX compression
+
+[T] This is a tool needed for the nx server to authenticate against the X11
+[T] server
+
+[U] http://www.nomachine.com/developers.php
+
+[A] NoMachine {http://www.nomachine.com}
+[M] Andreas V. 'netrunner' Meier <avmeier@web.de>
+
+[C] extra/network
+
+[L] GPL
+[S] Stable
+[V] 1.4.0-65
+[P] X -----5---9 800.000
+
+[SRC] nx-X11
+[D] 398004649 nxcomp-1.4.0-31.tar.gz http://www.nomachine.com/download/nxsources/1.4.0/
+[D] 2995221463 nxcompext-1.4.0-3.tar.gz http://www.nomachine.com/download/nxsources/1.4.0/
+[D] 3441139659 nxproxy-1.4.0-2.tar.gz http://www.nomachine.com/download/nxsources/1.4.0/
+[D] 3137216328 nx-X11-1.4.0-10.tar.gz http://www.nomachine.com/download/nxsources/1.4.0/
+[D] 4086779914 nxagent-1.4.0-65.tar.gz http://www.nomachine.com/download/nxsources/1.4.0/
+[D] 2245012296 nxauth-1.4.0-2.tar.gz http://www.nomachine.com/download/nxsources/1.4.0/
+
diff --git a/package/avm/nx-X11/xf_config.sh b/package/avm/nx-X11/xf_config.sh
new file mode 100644
index 000000000..eb91807cc
--- /dev/null
+++ b/package/avm/nx-X11/xf_config.sh
@@ -0,0 +1,88 @@
+prefix="opt/nx-X11"
+etcprefix="$prefix/etc"
+
+# extract and patch base
+xf_extract() {
+	echo "Extracting source (for package version $ver) ..."
+	for x in $archdir/* ; do
+		tar $taropt $archdir/$x
+	done
+
+	cd nx-X11
+}
+
+# build the World
+xf_build() {
+	eval $MAKE World
+	# cd nls ; eval $MAKE ; cd ..
+}
+
+# install the World
+xf_install() {
+	mkdir -p $root/$etcprefix
+
+	if [ "$arch_sizeof_char_p" = 8 ] ; then
+		mkdir -p $root/$prefix/X11R6/lib
+		ln -s lib $root/$prefix/X11R6/lib64
+	fi
+
+	eval $MAKE install
+	eval $MAKE install.man
+	cd nls ; eval $MAKE install ; cd ..
+	rm -fv $root/etc/fonts/*.bak
+
+	rm -fv $root/$prefix/X11
+	rm -fv $root/$prefix/bin/X11
+	rm -fv $root/$prefix/lib/X11
+	rm -fv $root/$prefix/include/X11
+
+	ln -sv X11R6 $root/$prefix/X11
+	ln -sv ../X11/bin $root/$prefix/bin/X11
+	ln -sv ../X11/lib/X11 $root/$prefix/lib/X11
+	ln -sv ../X11/include/X11 $root/$prefix/include/X11
+
+	mkdir -p $root/$prefix/X11R6/lib/X11/fonts/TrueType
+	
+	echo "Copy TWM config files ..."
+	cp -v programs/twm/system.twmrc.orig \
+	  programs/twm/sample-twmrc/original.twmrc
+	cp -v programs/twm/sample-twmrc/*.twmrc $root/usr/X11R6/lib/X11/twm/
+	register_wm twm TWM /usr/X11/bin/twm
+
+	echo "Copying default example configs ..."
+	        cp -fv $base/package/x11/${pkg}/xorg.conf.data \
+			$root/$etcprefix/X11/xorg.conf.example
+		cp -fv $root/$etcprefix/X11/xorg.conf{.example,}
+		cp -fv $base/package/x11/${pkg}/local.conf.data \
+			$root/$etcprefix/fonts/local.conf
+
+	echo "Fixing compiled keymaps directory ..."
+	mkdir -p $root/var/lib/xkb $root/$etcprefix/X11/xkb
+	cp -fu programs/xkbcomp/compiled/README $root/$prefix/var/lib/xkb
+	rm -rf $root/$etcprefix/X11/xkb/compiled
+	ln -sf $root/$prefix/var/lib/xkb $root/$etcprefix/X11/xkb/compiled
+}
+
+# configure the World
+xf_config() {
+	echo "Configuring X-Windows ..."
+	cat >> config/cf/host.def << EOT
+/* Disable the internal zlib to use the system installed one */
+#define		HasZlib			YES
+/* Disable the internal expat library to use the system installed one */
+#define		HasExpat		YES
+
+/* Less warnings with recent gccs ... */
+#define		DefaultCCOptions	-ansi GccWarningOptions
+
+/* Make sure config files are allways installed ... */
+#define		InstallXinitConfig	YES
+#define		InstallXdmConfig	YES
+#define		InstallFSConfig		YES
+
+/* do not install duplicate crap in /etc/X11 */
+#define		UseSeparateConfDir	NO
+
+EOT
+}
+