--- java.eselect.2.0.22	2006-05-09 19:17:02.000000000 +0200
+++ java.eselect.fixed	2006-05-09 19:16:00.000000000 +0200
@@ -10,8 +10,8 @@
 VERSION=$(svn_date_to_version "${SVN_DATE}" )
 
 VM_BASE=/usr/lib/jvm/
-VM_SYSTEM=/etc/java-config/system-vm
-VM_USER=${HOME}/.gentoo/user-vm
+VM_SYSTEM=/etc/java-config-2/current-system-vm
+VM_USER=${HOME}/.gentoo/java-config-2/current-user-vm
 
 find_targets() {
 	local f
@@ -67,12 +67,14 @@
 		[[ -L ${VM_USER} ]] && user_name=$(sym_to_vm ${VM_USER})
 
 		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
+			mark="";
 			if [[ ${targets[${i}]} == ${system_name} ]]; then
-				targets[${i}]="${targets[${i}]} $(highlight 'system-vm')"
+				mark="${mark} $(highlight 'system-vm')";
 			fi
-			if [[ ${targets[${i}]} == ${user_user} ]]; then
-				targets[${i}]="${targets[${i}]} $(highlight 'user-vm' )"
+			if [[ ${targets[${i}]} == ${user_name} ]]; then
+				mark="${mark} $(highlight 'user-vm')";
 			fi
+			targets[${i}]="${targets[${i}]} ${mark}"
 		done
 		write_numbered_list "${targets[@]}"
 	else