Index: trunk/docs/install/installation.rst
===================================================================
--- trunk/docs/install/installation.rst	(revision 806)
+++ trunk/docs/install/installation.rst	(revision 809)
@@ -343,4 +343,8 @@
 file.
 
+.. note:: 
+   You can use the `--with-java-rpath` option to produce a binary
+   aware of the libjvm location.
+
 
 .. note:: 
Index: trunk/zoo-project/zoo-kernel/configure.ac
===================================================================
--- trunk/zoo-project/zoo-kernel/configure.ac	(revision 806)
+++ trunk/zoo-project/zoo-kernel/configure.ac	(revision 809)
@@ -595,4 +595,8 @@
 	[JDKHOME="$withval"; JAVA_ENABLED="-DUSE_JAVA"], [JAVA_ENABLED=""])
 
+AC_ARG_WITH([java-rpath], 
+	[AS_HELP_STRING([--with-java-rpath=yes], [To set rpath for java support, disabled by default])], 
+	[JAVA_RPATH="$withval"], [JAVA_RPATH=""])
+
 if test -z "$JAVA_ENABLED"
 then
@@ -621,11 +625,20 @@
 			JAVA_LDFLAGS="-L$JDKHOME/jre/lib/i386/server/ -ljvm -lpthread"
 			JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
+			if test x$JAVA_RPATH = "xyes"; then
+			   JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/i386/server/"
+			fi
 		else
 			if test -d "$JDKHOME/jre/lib/amd64"; then
 			   JAVA_LDFLAGS="-L$JDKHOME/jre/lib/amd64/server/ -ljvm -lpthread"
 			   JAVA_CPPFLAGS="-I$JDKHOME/include -I$JDKHOME/include/linux"
+			   if test x$JAVA_RPATH = "xyes"; then
+			      JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/amd64/server/"
+			   fi
 			else
 			   JAVA_LDFLAGS="-L$JDKHOME/jre/lib/server/ -ljvm -lpthread"
 			   JAVA_CPPFLAGS="-I$JDKHOME/include/ -I$JDKHOME/include/darwin"
+			   if test x$JAVA_RPATH = "xyes"; then
+			      JAVA_LDFLAGS="$JAVA_LDFLAGS -Wl,-rpath,$JDKHOME/jre/lib/server/"
+			   fi
 			fi
 		fi