diff --git a/ChangeLog b/ChangeLog
index 2f1dcb0..2cc6bb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-13  David Wetzel <dave@turbocat.de>
+	* GSWeb/GSWDeployedBundle.m
+	remove local NSAutoreleasePool
+	* configure.ac
+	GSWeb.framework -> GSWeb
+	* configure
+	regenerate
+	
 2010-06-13  David Wetzel <dave@turbocat.de>
 	rename all *.framework top level directories to their basename.
 	* GSWDatabase/WODisplayGroup.m
diff --git a/GSWeb/GSWDeployedBundle.m b/GSWeb/GSWDeployedBundle.m
index 7ccdb2a..36058fa 100644
--- a/GSWeb/GSWDeployedBundle.m
+++ b/GSWeb/GSWDeployedBundle.m
@@ -317,7 +317,6 @@ RCS_ID("$Id$")
   NSString* path=nil;
   if (aName)
     {
-      NSAutoreleasePool* arp = [NSAutoreleasePool new];
       NS_DURING
         {
           NSString* emptyString=@"";
@@ -415,13 +414,11 @@ RCS_ID("$Id$")
           localException=ExceptionByAddingUserInfoObjectFrameInfo0(localException,
                                                                    @"lockedCachedRelativePathForResourceNamed:inDirectory:language:");
           RETAIN(localException);
-          DESTROY(arp);
           AUTORELEASE(localException);
           [localException raise];
         }
       NS_ENDHANDLER;
       RETAIN(path);
-      DESTROY(arp);
       AUTORELEASE(path);      
     };
   return path;
diff --git a/configure b/configure
index 253c3d8..d77db92 100755
--- a/configure
+++ b/configure
@@ -3148,7 +3148,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -3169,7 +3169,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -4145,7 +4145,7 @@ AUX_LIBS="$LIBS"
 #--------------------------------------------------------------------
 # Write the Makefiles
 #--------------------------------------------------------------------
-ac_config_files="$ac_config_files config.mak gsweb.make GSWeb.framework/Makefile.preamble"
+ac_config_files="$ac_config_files config.mak gsweb.make GSWeb/Makefile.preamble"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4702,7 +4702,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "config.mak") CONFIG_FILES="$CONFIG_FILES config.mak" ;;
     "gsweb.make") CONFIG_FILES="$CONFIG_FILES gsweb.make" ;;
-    "GSWeb.framework/Makefile.preamble") CONFIG_FILES="$CONFIG_FILES GSWeb.framework/Makefile.preamble" ;;
+    "GSWeb/Makefile.preamble") CONFIG_FILES="$CONFIG_FILES GSWeb/Makefile.preamble" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
diff --git a/configure.ac b/configure.ac
index a9aa840..a17822b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,5 +157,5 @@ AC_SUBST(AUX_LIBS)
 #--------------------------------------------------------------------
 # Write the Makefiles
 #--------------------------------------------------------------------
-AC_CONFIG_FILES([config.mak gsweb.make GSWeb.framework/Makefile.preamble])
+AC_CONFIG_FILES([config.mak gsweb.make GSWeb/Makefile.preamble])
 AC_OUTPUT