4 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 86ccbdb01..a30b85101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,7 @@ nx-libs (2:3.5.0-0~x2go2) UNRELEASED; urgency=low
     files from within /debian/rules.
   * Add patch: 019_nx-x11_expat-build-against-system-libxmltok.patch, fixes
     lintian error: embedded-library: expat. Build-depend on libxmltok1-dev.
+  * Fix LD_LIBRARY_PATH export in wrapper scripts/patches.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 28 Dec 2011 19:06:26 +0100
 
diff --git a/debian/patches/005_nxagent_add-nxagent-wrapper.patch b/debian/patches/005_nxagent_add-nxagent-wrapper.patch
index a2a9f928b..2d0123bcc 100644
--- a/debian/patches/005_nxagent_add-nxagent-wrapper.patch
+++ b/debian/patches/005_nxagent_add-nxagent-wrapper.patch
@@ -4,7 +4,7 @@
 +#!/bin/bash
 +
 +NX_LIBS=/usr/lib/nx
-+LD_LIBRARY_PATH=/usr/lib/nx
++LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH
 +
 +export NX_LIBS
 +export LD_LIBRARY_PATH
diff --git a/debian/patches/008_nxproxy_add-nxproxy-wrapper.patch b/debian/patches/008_nxproxy_add-nxproxy-wrapper.patch
index 9c208e2e8..0d9077f5d 100644
--- a/debian/patches/008_nxproxy_add-nxproxy-wrapper.patch
+++ b/debian/patches/008_nxproxy_add-nxproxy-wrapper.patch
@@ -4,7 +4,7 @@
 +#!/bin/bash
 +
 +NX_LIBS=/usr/lib/nx
-+LD_LIBRARY_PATH=/usr/lib/nx
++LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH
 +
 +export NX_LIBS
 +export LD_LIBRARY_PATH
diff --git a/debian/patches/011_nxauth_add-nxauth-wrapper.patch b/debian/patches/011_nxauth_add-nxauth-wrapper.patch
index 231acc6f3..1a731b6a5 100644
--- a/debian/patches/011_nxauth_add-nxauth-wrapper.patch
+++ b/debian/patches/011_nxauth_add-nxauth-wrapper.patch
@@ -4,7 +4,7 @@
 +#!/bin/bash
 +
 +NX_LIBS=/usr/lib/nx
-+LD_LIBRARY_PATH=/usr/lib/nx
++LD_LIBRARY_PATH=/usr/lib/nx:/usr/lib/nx/X11:$LD_LIBRARY_PATH
 +
 +export NX_LIBS
 +export LD_LIBRARY_PATH