diff -ur nx-libs-3.5.0.32.orig/Makefile nx-libs-3.5.0.32/Makefile
--- nx-libs-3.5.0.32.orig/Makefile	2015-07-04 04:54:35.000000000 +0200
+++ nx-libs-3.5.0.32/Makefile	2015-08-05 09:26:33.000000000 +0200
@@ -68,12 +68,12 @@
 
 	# FIXME: the below install logic should work via nxproxy/Makefile.in
 	# overriding for now...
-	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin
-	$(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(NXLIBDIR)/bin
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/bin
+	$(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(LIBDIR)/bin
 
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/
 	$(INSTALL_FILE) nxproxy/man/nxproxy.1 $(DESTDIR)$(PREFIX)/share/man/man1/
-	gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1
+	gzip $(DESTDIR)$(PREFIX)/share/man/man1/nxproxy.1
 
 install-full:
 	for f in nxagent nxauth x2goagent; do \
@@ -82,7 +82,7 @@
 	   $(MAKE) -C $$d install; done
 
 	$(INSTALL_DIR) $(DESTDIR)$(X2GOLIBDIR)/bin/
-	cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf $(NXLIBDIR)/bin/nxagent x2goagent
+	cd $(DESTDIR)$(X2GOLIBDIR)/bin/ && ln -sf $(LIBDIR)/bin/nxagent x2goagent
 
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/pixmaps
 	$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/x2go.xpm $(DESTDIR)$(PREFIX)/share/pixmaps
@@ -94,16 +94,16 @@
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/x2go/versions
 	$(INSTALL_FILE) VERSION.x2goagent $(DESTDIR)$(PREFIX)/share/x2go/versions
 
-	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin
-	$(INSTALL_PROGRAM) nx-X11/programs/nxauth/nxauth $(DESTDIR)$(NXLIBDIR)/bin
-	$(INSTALL_PROGRAM) nx-X11/programs/Xserver/nxagent $(DESTDIR)$(NXLIBDIR)/bin
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/bin
+	$(INSTALL_PROGRAM) nx-X11/programs/nxauth/nxauth $(DESTDIR)$(LIBDIR)/bin
+	$(INSTALL_PROGRAM) nx-X11/programs/Xserver/nxagent $(DESTDIR)$(LIBDIR)/bin
 
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/
 	$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 $(DESTDIR)$(PREFIX)/share/man/man1/
 	$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 $(DESTDIR)$(PREFIX)/share/man/man1/
 	$(INSTALL_FILE) nx-X11/programs/nxauth/nxauth.man $(DESTDIR)$(PREFIX)/share/man/man1/
 	mv -f $(DESTDIR)$(PREFIX)/share/man/man1/nxauth.man $(DESTDIR)$(PREFIX)/share/man/man1/nxauth.1
-	gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1
+	gzip $(DESTDIR)$(PREFIX)/share/man/man1/{nxagent,nxauth,x2goagent}.1
 
 	# create a clean nx-X11/.build-exports space
 	rm -Rf nx-X11/.build-exports
@@ -123,8 +123,8 @@
 	    cp -a "$$(string_rep "$$libpath" "$$libfile" "$$link")" "$$(string_rep "$$libdir" exports .build-exports)"; \
 	done;
 
-	$(INSTALL_DIR) $(DESTDIR)$(USRLIBDIR)
-	$(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so* $(DESTDIR)$(USRLIBDIR)/
+	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)
+	$(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so* $(DESTDIR)$(NXLIBDIR)/
 
 	. replace.sh; set -x; find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \
 	    while read dirname; do \
@@ -135,11 +135,11 @@
 
 	# Provide means for Xinerama support in NX/X2Go sessions. This
 	# This also requires three post-install symlinks created by libnx-xinerama1:
-	# $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_X11.so.6 -> /usr/<libdir>/libX11.so.6
-	# $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_Xext.so.6 -> /usr/<libdir>/libXext.so.6
-	# $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1 -> /usr/<libdir>/libNX_Xinerama.so.1
+	# $(DESTDIR)$(NXLIBDIR)/Xinerama/libNX_X11.so.6 -> /usr/<libdir>/libX11.so.6
+	# $(DESTDIR)$(NXLIBDIR)/Xinerama/libNX_Xext.so.6 -> /usr/<libdir>/libXext.so.6
+	# $(DESTDIR)$(NXLIBDIR)/Xinerama/libXinerama.so.1 -> /usr/<libdir>/libNX_Xinerama.so.1
 	# Only create the owned directory here for nx-x11-common.
-	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11/Xinerama
+	$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/Xinerama
 
 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/nx/X11/bitmaps
 	$(INSTALL_FILE) nx-X11/.build-exports/include/X11/bitmaps/* \
@@ -171,8 +171,8 @@
 	$(RM_FILE) $(DESTDIR)$(BINDIR)/nxproxy
 	# FIXME: don't use uninstall rule in nxproxy/Makefile.in, let's do
         # it on our own for now...
-	$(RM_FILE) $(DESTDIR)$(NXLIBDIR)/bin/nxproxy
-	$(RM_DIR) $(DESTDIR)$(NXLIBDIR)/bin/
+	$(RM_FILE) $(DESTDIR)$(LIBDIR)/bin/nxproxy
+	$(RM_DIR) $(DESTDIR)$(LIBDIR)/bin/
 	$(RM_FILE) $(DESTDIR)$(PREFIX)/share/man/man1/*.1
 
 uninstall-full:
diff -ur nx-libs-3.5.0.32.orig/bin/nxagent nx-libs-3.5.0.32/bin/nxagent
--- nx-libs-3.5.0.32.orig/bin/nxagent	2015-07-04 04:54:35.000000000 +0200
+++ nx-libs-3.5.0.32/bin/nxagent	2015-08-05 09:26:33.000000000 +0200
@@ -23,7 +23,7 @@
 NX_TEMP=${NX_TEMP:-/tmp}
 export NX_TEMP
 
-test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
-test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
+test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS && export LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
+test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS && export LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
 
 exec $NX_LIBS/bin/$NXAPP "$@"
diff -ur nx-libs-3.5.0.32.orig/bin/nxauth nx-libs-3.5.0.32/bin/nxauth
--- nx-libs-3.5.0.32.orig/bin/nxauth	2015-07-04 04:54:35.000000000 +0200
+++ nx-libs-3.5.0.32/bin/nxauth	2015-08-05 09:26:33.000000000 +0200
@@ -23,7 +23,7 @@
 NX_TEMP=${NX_TEMP:-/tmp}
 export NX_TEMP
 
-test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
-test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
+test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS && export LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
+test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS && export LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
 
-exec $NX_LIBS/bin/$NXAPP "$@"
\ No newline at end of file
+exec $NX_LIBS/bin/$NXAPP "$@"
diff -ur nx-libs-3.5.0.32.orig/bin/nxproxy nx-libs-3.5.0.32/bin/nxproxy
--- nx-libs-3.5.0.32.orig/bin/nxproxy	2015-07-04 04:54:35.000000000 +0200
+++ nx-libs-3.5.0.32/bin/nxproxy	2015-08-05 09:26:33.000000000 +0200
@@ -23,7 +23,7 @@
 NX_TEMP=${NX_TEMP:-/tmp}
 export NX_TEMP
 
-test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
-test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS
+test -x $NX_LOCAL_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS && export LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
+test -x $NX_LIBS/bin/$NXAPP && export NX_LIBS=$NX_LIBS && export LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
 
-exec $NX_LIBS/bin/$NXAPP "$@"
\ No newline at end of file
+exec $NX_LIBS/bin/$NXAPP "$@"
diff -ur nx-libs-3.5.0.32.orig/bin/x2goagent nx-libs-3.5.0.32/bin/x2goagent
--- nx-libs-3.5.0.32.orig/bin/x2goagent	2015-07-04 04:54:35.000000000 +0200
+++ nx-libs-3.5.0.32/bin/x2goagent	2015-08-05 09:26:33.000000000 +0200
@@ -23,7 +23,9 @@
 NX_TEMP=${NX_TEMP:-/tmp}
 export NX_TEMP
 
-test -x $NX_LOCAL_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS
-test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS
+test -x $NX_LOCAL_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LOCAL_LIBS && export LD_LIBRARY_PATH=$NX_LOCAL_LIBS:$NX_LOCAL_LIBS/X11:$LD_LIBRARY_PATH
+test -x $NX_LIBS/../x2go/bin/$NXAPP && export NX_LIBS=$NX_LIBS && export LD_LIBRARY_PATH=$NX_LIBS:$NX_LIBS/X11:$LD_LIBRARY_PATH
+
+export NXAGENT_KEYSTROKEFILE=/etc/x2go/keystrokes.cfg
 
 exec $NX_LIBS/../x2go/bin/$NXAPP "$@"
diff -ur nx-libs-3.5.0.32.orig/nx-X11/config/cf/Imake.tmpl nx-libs-3.5.0.32/nx-X11/config/cf/Imake.tmpl
--- nx-libs-3.5.0.32.orig/nx-X11/config/cf/Imake.tmpl	2015-07-04 04:54:34.000000000 +0200
+++ nx-libs-3.5.0.32/nx-X11/config/cf/Imake.tmpl	2015-08-05 09:26:33.000000000 +0200
@@ -829,7 +829,7 @@
 #define AlternateUsrLibDir YES
 #endif
 #else
-#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx)
+#define UsrLibDir Concat4(/usr,/,LibDirName,/nx)
 #ifndef AlternateUsrLibDir
 #define AlternateUsrLibDir NO
 #endif
Only in nx-libs-3.5.0.32/nx-X11/lib/X11: .OpenDis.c.swp
diff -ur nx-libs-3.5.0.32.orig/nx-X11/lib/X11/Imakefile nx-libs-3.5.0.32/nx-X11/lib/X11/Imakefile
--- nx-libs-3.5.0.32.orig/nx-X11/lib/X11/Imakefile	2015-07-04 04:54:34.000000000 +0200
+++ nx-libs-3.5.0.32/nx-X11/lib/X11/Imakefile	2015-08-06 10:23:14.000000000 +0200
@@ -43,12 +43,12 @@
 #endif
 
 NX_DEFINES = -DNX_TRANS_SOCKET \
+            -DNX_TRANS_TEST      \
              -DNX_TRANS_EXIT
 
 #            -DNX_TRANS_CHANGE    \
 #            -DNX_TRANS_WARN      \
 #            -DNX_TRANS_INFO      \
-#            -DNX_TRANS_TEST      \
 #            -DNX_TRANS_DEBUG     \
 
 #ifdef cygwinArchitecture
diff -ur nx-libs-3.5.0.32.orig/nx-X11/programs/Xserver/hw/nxagent/Display.c nx-libs-3.5.0.32/nx-X11/programs/Xserver/hw/nxagent/Display.c
--- nx-libs-3.5.0.32.orig/nx-X11/programs/Xserver/hw/nxagent/Display.c	2015-07-04 04:54:34.000000000 +0200
+++ nx-libs-3.5.0.32/nx-X11/programs/Xserver/hw/nxagent/Display.c	2015-08-05 16:16:49.000000000 +0200
@@ -85,8 +85,8 @@
 
 #define PANIC
 #define WARNING
-#undef  TEST
-#undef  DEBUG
+#define  TEST
+#define  DEBUG
 #undef  WATCH
 
 Display *nxagentDisplay = NULL;
@@ -631,6 +631,8 @@
 
   newDisplay = XOpenDisplay(display);
 
+  fprintf(stderr, "AAA020: nxagentInternalOpenDisplay: Hinter XOpenDisplay() [%s].\n", newDisplay);
+
   alarm(0);
 
   while (((result = sigaction(SIGALRM, &oldAction,
@@ -1167,6 +1169,10 @@
 {
   int i;
 
+  fprintf(stderr, "Display: AAA002 nx-X11/programs/Xserver/hw/nxagent/Display.c:nxagentOpenDisplay() [%d] ms.\n", 1);
+  printf("Display: AAA002a nx-X11/programs/Xserver/hw/nxagent/Display.c:nxagentOpenDisplay()");
+
+
   if (!nxagentDoFullGeneration) return;
 
   #ifdef NXAGENT_TIMESTAMP
diff -ur nx-libs-3.5.0.32.orig/nxcomp/Auth.cpp nx-libs-3.5.0.32/nxcomp/Auth.cpp
--- nx-libs-3.5.0.32.orig/nxcomp/Auth.cpp	2015-07-04 04:54:33.000000000 +0200
+++ nx-libs-3.5.0.32/nxcomp/Auth.cpp	2015-08-05 09:26:33.000000000 +0200
@@ -30,8 +30,8 @@
 
 #define PANIC
 #define WARNING
-#undef  TEST
-#undef  DEBUG
+#define  TEST
+#define  DEBUG
 
 //
 // Store the provided cookie as our 'fake' cookie, then
@@ -509,6 +509,9 @@
 
 int Auth::checkCookie(unsigned char *buffer)
 {
+  cerr << "Warning" << ": AAA003 nxcomp/Auth.cpp:Auth::checkCookie() start, buffer:" << buffer << ",\n";
+
+
   if (isValid() != 1)
   {
     #ifdef PANIC
@@ -558,6 +561,8 @@
     return -1;
   }
 
+  cerr << "Warning" << ": AAA003a nxcomp/Auth.cpp:Auth::checkCookie(), buffer[0]: " << buffer[0] << ", matchedProtoSize: " << matchedProtoSize << ", matchedDataSize: " << matchedDataSize << ", protoSize: " << protoSize << ", dataSize_: " << dataSize_ << ".\n";
+
   //
   // Check if both the authentication protocol
   // and the fake cookie match our data.
diff -ur nx-libs-3.5.0.32.orig/nxcomp/Loop.cpp nx-libs-3.5.0.32/nxcomp/Loop.cpp
--- nx-libs-3.5.0.32.orig/nxcomp/Loop.cpp	2015-07-04 04:54:34.000000000 +0200
+++ nx-libs-3.5.0.32/nxcomp/Loop.cpp	2015-08-05 09:31:02.000000000 +0200
@@ -120,9 +120,9 @@
 
 #define PANIC
 #define WARNING
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
+#define  TEST
+#define  DEBUG
+#define  DUMP
 
 //
 // Enable log output in signal handler.
@@ -14279,6 +14279,7 @@
     cerr << "Info" << ": Listening to slave connections "
          << "on port '" << slavePort << "'.\n";
   }
+  cerr << "Info" << ": AAA001 end of nxcomp/Loop.cpp:PrintConnectionInfo()\n";
 }
 
 void PrintVersionInfo()
diff -ur nx-libs-3.5.0.32.orig/nxcomp/Proxy.cpp nx-libs-3.5.0.32/nxcomp/Proxy.cpp
--- nx-libs-3.5.0.32.orig/nxcomp/Proxy.cpp	2015-07-04 04:54:34.000000000 +0200
+++ nx-libs-3.5.0.32/nxcomp/Proxy.cpp	2015-08-05 09:28:11.000000000 +0200
@@ -96,9 +96,9 @@
 
 #define WARNING
 #define PANIC
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
+#define  TEST
+#define  DEBUG
+#define  DUMP
 
 //
 // Log the important tracepoints related
@@ -1088,6 +1088,9 @@
           // ered. Check if this is the first time that
           // the failure is detected.
           //
+            #ifdef TEST
+            *logofs << "AAA010: vor handleWrite in /nxcomp/Proxy.cpp.\n" << logofs_flush;
+            #endif
 
           int result = channels_[channelId] -> handleWrite(message, dataLength);
 
diff -ur nx-libs-3.5.0.32.orig/nxcomp/ServerChannel.cpp nx-libs-3.5.0.32/nxcomp/ServerChannel.cpp
--- nx-libs-3.5.0.32.orig/nxcomp/ServerChannel.cpp	2015-07-04 04:54:34.000000000 +0200
+++ nx-libs-3.5.0.32/nxcomp/ServerChannel.cpp	2015-08-05 09:28:34.000000000 +0200
@@ -66,10 +66,10 @@
 
 #define PANIC
 #define WARNING
-#undef  OPCODES
-#undef  TEST
-#undef  DEBUG
-#undef  DUMP
+#define  OPCODES
+#define  TEST
+#define  DEBUG
+#define  DUMP
 
 //
 // Log the important tracepoints related