diff -r 552b37a0a416 o.n.bootstrap/launcher/unix/nbexec
--- a/o.n.bootstrap/launcher/unix/nbexec	Tue Jul 22 18:16:34 2008 +0200
+++ b/o.n.bootstrap/launcher/unix/nbexec	Wed Jul 23 16:51:14 2008 +0200
@@ -403,6 +403,7 @@
     cp=""
     updatercp=""
     
+    build_cp "${userdir}"
     build_cp "${plathome}"
     
     if [ -f "${userdir}/modules/ext/updater.jar" ] ; then
diff -r 552b37a0a416 o.n.bootstrap/src/org/netbeans/MainImpl.java
--- a/o.n.bootstrap/src/org/netbeans/MainImpl.java	Tue Jul 22 18:16:34 2008 +0200
+++ b/o.n.bootstrap/src/org/netbeans/MainImpl.java	Wed Jul 23 16:51:14 2008 +0200
@@ -52,6 +52,7 @@
 import java.security.PermissionCollection;
 import java.security.Permissions;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.HashSet;
@@ -125,6 +126,14 @@
         ArrayList<File> list = new ArrayList<File>();
 
         HashSet<File> processedDirs = new HashSet<File> ();
+        List<String> argsL = Arrays.asList (args);
+        int idx = argsL.indexOf ("--userdir");
+        if (idx != -1 && argsL.size () > idx + 1) {
+            String user = argsL.get (idx + 1);
+            if (user != null) {
+                build_cp (new File (user), list, processedDirs);
+            }
+        }
         String home = System.getProperty ("netbeans.home"); // NOI18N
         if (home != null) {
             build_cp (new File (home), list, processedDirs);