--- java-vm-2.eclass.orig	2007-01-25 21:45:04.000000000 +1300
+++ java-vm-2.eclass	2007-01-25 21:56:53.000000000 +1300
@@ -150,6 +150,7 @@
 	local env_file="${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}"
 	local old_env_file="${D}/etc/env.d/java/20${P}"
 	local source_env_file="${FILESDIR}/${VMHANDLE}.env"
+	local libdir="$(get_libdir)"
 
 	if [[ ! -f ${source_env_file} ]]; then
 		die "Unable to find the env file: ${source_env_file}"
@@ -162,6 +163,7 @@
 		-e "s/@PV@/${PV}/g" \
 		-e "s/@PF@/${PF}/g" \
 		-e "s/@PLATFORM@/${platform}/g" \
+		-e "s/@LIBDIR@/${libdir}/g" \
 		-e "/^LDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \
 		< ${source_env_file} \
 		> ${env_file} || die "sed failed"