diff --git a/build.xml b/build.xml
index a056ab216..55d0d9832 100644
--- a/build.xml
+++ b/build.xml
@@ -64,6 +64,7 @@
 <property name="libx" location="libx"/>
 <property name="build" location="classes"/>
 <property name="htroot" location="htroot"/>
+<property name="www" location="DATA/HTDOCS/www"/>
 <property name="locales" location="locales"/>
 <property name="release" location="RELEASE"/>
     
@@ -214,6 +215,12 @@
          classpathref="project.class.path"
          debug="true" debuglevel="lines,vars,source" 
          source="${javacSource}" target="${javacTarget}"/>
+
+  <!-- compile www directory -->
+  <javac srcdir="${www}/" 
+         classpathref="project.class.path"
+	     debug="true" debuglevel="lines,vars,source" 
+	     source="${javacSource}" target="${javacTarget}"/>	
 </target>
 	
 <!-- compiling optional content parsers and building install packages -->
@@ -319,7 +326,7 @@
 <target name="distMain" depends="compileMain" description="Compiling sources and make a release file ...">
 
   <tar destfile="${release}/${releaseFile}" compression="gzip" defaultexcludes="yes" longfile="gnu">
-
+  	
   <!-- copy class files -->
   <tarfileset dir="${build}" prefix="${releaseDir}/classes" dirmode="${accessRightsDir}" mode="${accessRightsFile}" >
     <include name="**/*.*"/>
diff --git a/source/de/anomic/server/serverClassLoader.java b/source/de/anomic/server/serverClassLoader.java
index aafb1a122..868cd11a3 100644
--- a/source/de/anomic/server/serverClassLoader.java
+++ b/source/de/anomic/server/serverClassLoader.java
@@ -43,78 +43,93 @@ package de.anomic.server;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Hashtable;
 
 public final class serverClassLoader extends ClassLoader {
 
-    private final Hashtable classes;
+    private final HashMap classes;
 
     public serverClassLoader() {
-	super(ClassLoader.getSystemClassLoader());
-	classes = new Hashtable();
+        super(ClassLoader.getSystemClassLoader());
+        this.classes = new HashMap();
     }
 
     public serverClassLoader(ClassLoader parent) {
-	super(parent);
-	classes = new Hashtable();
+        super(parent);
+        classes = new HashMap();
     }
 
     public Package[] packages() {
-	return super.getPackages();
+        return super.getPackages();
     }
 
     public Class loadClass(File classfile) throws ClassNotFoundException {
-	// we consider that the classkey can either be only the name of a class, or a partial or
-	// complete path to a class file
-
-	// normalize classkey: strip off '.class'
-	//if (classkey.endsWith(".class")) classkey = classkey.substring(0, classkey.length() - 6);
-
-	// try to find the class in the hashtable
-	Class c = (Class) classes.get(classfile);
-	if (c != null) return c;
-
-	// consider classkey as a file and extract the file name
-	//File classfile = new File(classkey);
-	// this file cannot exist for real, since we stripped off the .class
-	// we constructed the classfile for the only purpose to strip off the name:
-
-	// get the class name out of the classfile
-	String classname = classfile.getName();
-        int p = classname.indexOf(".");
-        classname = classname.substring(0, p);
-
-	// now that we have the name, we can create the real class file
-	//classfile = new File(classkey + ".class");
-
-	// first try: take the class out of the cache, denoted by the classname
+        // we consider that the classkey can either be only the name of a class, or a partial or
+        // complete path to a class file
+        
+        // normalize classkey: strip off '.class'
+        //if (classkey.endsWith(".class")) classkey = classkey.substring(0, classkey.length() - 6);
+        
+        String classFileName = null;
         try {
-	    c = findLoadedClass(classname);
-	    if (c == null) {
-		// second try: ask the system
-		c = findSystemClass(classname);
-	    }
-	    if (c == null) {
-		// third try
-		throw new ClassNotFoundException("internal trigger");
-	    }
-	} catch (ClassNotFoundException e) {
-	    //System.out.println("INTERNAL ERROR1 in cachedClassLoader: " + e.getMessage());
-	    // third try: load the file from the file system
-	    byte[] b;
-	    try {
+            classFileName = classfile.getCanonicalPath();
+        } catch (IOException e) {
+            throw new ClassNotFoundException("Unable to resolve the classfile path");
+        }
+        
+        // try to load the class
+        synchronized(classFileName.intern()) {
+            // first try: take the class out of the cache, denoted by the classname    
+            Class c = (Class) this.classes.get(classfile);
+            if (c != null) return c;
+            
+            // consider classkey as a file and extract the file name
+            //File classfile = new File(classkey);
+            // this file cannot exist for real, since we stripped off the .class
+            // we constructed the classfile for the only purpose to strip off the name:
+            
+            // get the class name out of the classfile
+            String classname = classfile.getName();
+            int p = classname.indexOf(".");
+            classname = classname.substring(0, p);
+            
+            // now that we have the name, we can create the real class file
+            //classfile = new File(classkey + ".class");
+            
+
+// This code doesn't work properly if there are multiple classes with the same name
+// This is because we havn't definded package names in our servlets
+//                
+//          try {
+//          c = findLoadedClass(classname);
+//          if (c == null) {
+//          // second try: ask the system
+//          c = findSystemClass(classname);
+//          }
+//          if (c == null) {
+//          // third try
+//          throw new ClassNotFoundException("internal trigger");
+//          }
+//          } catch (ClassNotFoundException e) {
+            //System.out.println("INTERNAL ERROR1 in cachedClassLoader: " + e.getMessage());
+            
+            // third try: load the file from the file system
+            byte[] b;
+            try {
                 b = serverFileUtils.read(classfile);
-		// now make a class out of the stream
-		//  System.out.println("loading class " + classname + " from file " + classfile.toString());
-		c = this.defineClass(classname, b, 0, b.length);
-		resolveClass(c);
-		classes.put(classfile, c);
-	    } catch (IOException ee) {
-		//System.out.println("INTERNAL ERROR2 in cachedClassLoader: " + ee.getMessage());
-		throw new ClassNotFoundException(classfile.toString());
-	    }
-	}
-	return c;
+                // now make a class out of the stream
+                //  System.out.println("loading class " + classname + " from file " + classfile.toString());
+                c = this.defineClass(classname, b, 0, b.length);
+                resolveClass(c);
+                this.classes.put(classfile, c);
+            } catch (IOException ee) {
+                //System.out.println("INTERNAL ERROR2 in cachedClassLoader: " + ee.getMessage());
+                throw new ClassNotFoundException(classfile.toString());
+            }
+//          }
+            return c;
+        }
     }
 
 }
\ No newline at end of file