diff --git a/example/solr/conf/schema.xml b/example/solr/conf/schema.xml
index bd572da59da..ab35cdda42d 100755
--- a/example/solr/conf/schema.xml
+++ b/example/solr/conf/schema.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" ?>
 <!-- The Solr schema file. This file should be named "schema.xml" and
-     should be in the solrconf directory or located where the classloader 
-     for the Solr webapp can find it.
+ should be in the conf directory under the solr home
+ (i.e. ./solr/conf/schema.xml by default) 
+ or located where the classloader for the Solr webapp can find it.
 
  For more information, on how to customize this file, please see...
  http://wiki.apache.org/solr/SchemaXml
-
- -->
+-->
 
 <schema name="example" version="1.1">
   <types>
diff --git a/example/solr/conf/solrconfig.xml b/example/solr/conf/solrconfig.xml
index e2cb1ff091f..3744943bb2a 100755
--- a/example/solr/conf/solrconfig.xml
+++ b/example/solr/conf/solrconfig.xml
@@ -3,7 +3,7 @@
 <config>
 
   <!-- Used to specify an alternate directory to hold all index data
-       other than the default ./solr/data
+       other than the default ./data under the Solr home.
        If replication is in use, this should match the replication configuration. -->
   <!--
   <dataDir>./solr/data</dataDir>
diff --git a/src/java/org/apache/solr/core/Config.java b/src/java/org/apache/solr/core/Config.java
index b5b2a4db00a..71004d32d85 100644
--- a/src/java/org/apache/solr/core/Config.java
+++ b/src/java/org/apache/solr/core/Config.java
@@ -214,23 +214,32 @@ public class Config {
     }
   }
 
-
-  private static String instance = project;
-  public static void setInstanceName(String name) {
-    instance = name;
+  private static String instanceDir; // solr home directory
+  private static String normalizeDir(String path) {
+    if (path==null) return null;
+    if ( !(path.endsWith("/") || path.endsWith("\\")) ) {
+      path+='/';
+    }
+    return path;
   }
-  public static String getInstanceName() {
-    return instance;
+
+  public static void setInstanceDir(String dir) {
+    instanceDir = normalizeDir(dir);
+    log.info("Solr home set to '" + instanceDir + "'");
   }
 
   public static String getInstanceDir() {
-    String str = System.getProperty(instance + ".solr.home");
-    if (str==null) {
-      str=instance + '/';
-    } else if ( !(str.endsWith("/") || str.endsWith("\\")) ) {
-      str+='/';
+    if (instanceDir==null) {
+      String prop = project + ".solr.home";
+      instanceDir = normalizeDir(System.getProperty(prop));
+      if (instanceDir==null) {
+        instanceDir=project + '/';
+        log.info("Solr home defaulted to '" + instanceDir + "'");
+      } else {
+        log.info("Solr home set to '" + instanceDir + "' from system property " + prop);
+      }
     }
-    return str;
+    return instanceDir;
   }
 
   // The directory where solr will look for config files by default.
diff --git a/src/webapp/WEB-INF/web.xml b/src/webapp/WEB-INF/web.xml
index 7c2c7fd39ef..042d9c76769 100644
--- a/src/webapp/WEB-INF/web.xml
+++ b/src/webapp/WEB-INF/web.xml
@@ -15,12 +15,13 @@
              "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl"/>
    -->
 
+
   <servlet>
     <servlet-name>SolrServer</servlet-name>
     <display-name>Solr</display-name>
     <description>Solr Server</description>
     <servlet-class>org.apache.solr.servlet.SolrServlet</servlet-class>
-    <load-on-startup>0</load-on-startup>
+    <load-on-startup>1</load-on-startup>
   </servlet>
 
   <servlet>
@@ -28,7 +29,7 @@
     <display-name>SolrUpdate</display-name>
     <description>Solr Update Handler</description>
     <servlet-class>org.apache.solr.servlet.SolrUpdateServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
+    <load-on-startup>2</load-on-startup>
   </servlet>
 
   <servlet>
diff --git a/src/webapp/resources/admin/_info.jsp b/src/webapp/resources/admin/_info.jsp
index ffcd4c3f0ed..794ac182466 100644
--- a/src/webapp/resources/admin/_info.jsp
+++ b/src/webapp/resources/admin/_info.jsp
@@ -3,6 +3,7 @@
                  org.apache.solr.schema.IndexSchema,
                  java.io.File"%>
 <%@ page import="java.net.InetAddress"%>
+<%@ page import="org.apache.solr.core.Config"%>
 
 <%
   SolrCore core = SolrCore.getSolrCore();
@@ -25,4 +26,5 @@
 
   String defaultSearch = SolrConfig.config.get("admin/defaultQuery/text()",null);
   String cwd=System.getProperty("user.dir");
+  String solrHome= Config.getInstanceDir();
 %>
diff --git a/src/webapp/resources/admin/header.jsp b/src/webapp/resources/admin/header.jsp
index bd08f620cdc..b924978f0ea 100644
--- a/src/webapp/resources/admin/header.jsp
+++ b/src/webapp/resources/admin/header.jsp
@@ -17,4 +17,4 @@ var host_name="<%= hostname %>"
 <%= enabledStatus==null ? "" : (isEnabled ? " - Enabled" : " - Disabled") %> </h1>
 
 <%= hostname %>:<%= port %><br/>
-<%= cwd %>
+cwd=<%= cwd %>  SolrHome=<%= solrHome %>
diff --git a/src/webapp/src/org/apache/solr/servlet/SolrServlet.java b/src/webapp/src/org/apache/solr/servlet/SolrServlet.java
index 820ff520165..08eb9c2f2d4 100644
--- a/src/webapp/src/org/apache/solr/servlet/SolrServlet.java
+++ b/src/webapp/src/org/apache/solr/servlet/SolrServlet.java
@@ -16,23 +16,23 @@
 
 package org.apache.solr.servlet;
 
-import org.apache.solr.core.*;
-import org.apache.solr.request.*;
-import org.apache.solr.schema.IndexSchema;
-import org.apache.solr.util.StrUtils;
+import org.apache.solr.core.Config;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.core.SolrException;
+import org.apache.solr.request.SolrQueryResponse;
+import org.apache.solr.request.XMLResponseWriter;
 
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.NoInitialContextException;
 import javax.servlet.ServletException;
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.BufferedReader;
 import java.util.logging.Logger;
-import java.util.Map;
-import java.util.Set;
-import java.net.MalformedURLException;
 
 /**
  * @author yonik
@@ -47,13 +47,27 @@ public class SolrServlet extends HttpServlet {
 
   public void init() throws ServletException
   {
-    ServletContext ctx = getServletContext();
+    log.info("SolrServlet.init()");
     try {
-      System.out.println("RESOURCE URL FOR .="+ctx.getResource("/select"));
-    } catch (MalformedURLException e) {
-      e.printStackTrace();
-    }
+      Context c = new InitialContext();
 
+      /***
+      System.out.println("Enumerating JNDI Context=" + c);
+      NamingEnumeration<NameClassPair> en = c.list("java:comp/env");
+      while (en.hasMore()) {
+        NameClassPair ncp = en.next();
+        System.out.println("  ENTRY:" + ncp);
+      }
+      System.out.println("JNDI lookup=" + c.lookup("java:comp/env/solr/home"));
+      ***/
+
+      String home = (String)c.lookup("java:comp/env/solr/home");
+      if (home!=null) Config.setInstanceDir(home);
+    } catch (NoInitialContextException e) {
+      log.info("JNDI not configured for Solr (NoInitialContextEx)");
+    } catch (NamingException e) {
+      log.info("No /solr/home in JNDI");
+    }
 
     log.info("user.dir=" + System.getProperty("user.dir"));
     core = SolrCore.getSolrCore();
diff --git a/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java b/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java
index 28a64788515..af1795eeca8 100644
--- a/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java
+++ b/src/webapp/src/org/apache/solr/servlet/SolrUpdateServlet.java
@@ -42,6 +42,7 @@ public class SolrUpdateServlet extends HttpServlet {
   public void init() throws ServletException
   {
     core = SolrCore.getSolrCore();
+    log.info("SolrUpdateServlet.init() done");
   }
 
   public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {