diff --git a/ChangeLog b/ChangeLog
index 7c1996e76..8556043c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-22 Manuel Guesdon <mguesdon@sbuilders.com>
+
+	* rules.make and bundle.make: changes for GNUstepWeb
+	* gswapp.make and gswbundle.make: added
+	
 2000-01-14  Adam Fedor  <fedor@gnu.org>
 
 	* GNUstep.csh.in (GNUSTEP_LOCAL_ROOT): Use correct quotes.
diff --git a/bundle.make b/bundle.make
index 6a93517a4..a12cb70b6 100644
--- a/bundle.make
+++ b/bundle.make
@@ -33,8 +33,6 @@ include $(GNUSTEP_MAKEFILES)/rules.make
 # The list of bundle resource file are in xxx_RESOURCE_FILES
 # The list of bundle resource directories are in xxx_RESOURCE_DIRS
 # The name of the principal class is xxx_PRINCIPAL_CLASS
-# The name of a file containing info.plist entries to be inserted into
-# Info-gnustep.plist (if any) is xxxInfo.plist
 # where xxx is the bundle name
 #
 
@@ -120,12 +118,9 @@ $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist: $(BUNDLE_DIR_NAME)/Resources
 	  if [ "$(MAIN_MODEL_FILE)" = "" ]; then \
 	    echo "  NSMainNibFile = \"\";"; \
 	  else \
-	    echo "  NSMainNibFile = \"`echo $(MAIN_MODEL_FILE) | sed -e 's/.gmodel//' -e 's/.gorm//' -e 's/.nib//'`\";"; \
+	    echo "  NSMainNibFile = \"`echo $(MAIN_MODEL_FILE) | sed 's/.gmodel//'`\";"; \
 	  fi; \
 	  echo "  NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
-	  if [ -r "$(INTERNAL_bundle_NAME)Info.plist" ]; then \
-	    cat $(INTERNAL_bundle_NAME)Info.plist; \
-	  fi; \
 	  echo "}") >$@
 
 internal-bundle-install:: $(BUNDLE_INSTALL_DIR)
diff --git a/gswapp.make b/gswapp.make
new file mode 100644
index 000000000..1dc240d1b
--- /dev/null
+++ b/gswapp.make
@@ -0,0 +1,349 @@
+#
+#   application.make
+#
+#   Makefile rules to build GNUstep-based applications.
+#
+#   Copyright (C) 1997 Free Software Foundation, Inc.
+#
+#   Author:  Manuel Guesdon <mguesdon@sbuilders.com>
+#   Based on application.make by Ovidiu Predescu <ovidiu@net-community.com>
+#   Based on gswapp.make by Helge Hess, MDlink online service center GmbH.
+#   Based on the original version by Scott Christley.
+#
+#   This file is part of the GNUstep Makefile Package.
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License
+#   as published by the Free Software Foundation; either version 2
+#   of the License, or (at your option) any later version.
+#   
+#   You should have received a copy of the GNU General Public
+#   License along with this library; see the file COPYING.LIB.
+#   If not, write to the Free Software Foundation,
+#   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# prevent multiple inclusions
+ifeq ($(GSWAPP_MAKE_LOADED),)
+GSWAPP_MAKE_LOADED=yes
+
+#
+# Include in the common makefile rules
+#
+include $(GNUSTEP_MAKEFILES)/rules.make
+
+#TODO: move this
+TAR=tar
+LN_S=ln -s
+GNUSTEP_GSWAPPS=$(GNUSTEP_INSTALLATION_DIR)/GSWApps
+
+#
+# The name of the application is in the GSWAPP_NAME variable.
+# The list of languages the app is localized in are in xxx_LANGUAGES <==
+# The list of application resource file are in xxx_RESOURCE_FILES
+# The list of localized application resource file are in 
+#  xxx_LOCALIZED_RESOURCE_FILES <==
+# The list of application resource directories are in xxx_RESOURCE_DIRS
+# The list of application web server resource directories are in 
+#  xxx_WEBSERVER_RESOURCE_DIRS <==
+# The list of localized application web server resource directories are in 
+#  xxx_LOCALIZED_WEBSERVER_RESOURCE_DIRS
+# where xxx is the application name <==
+
+GSWAPP_NAME:=$(strip $(GSWAPP_NAME))
+
+# Determine the application directory extension
+ifeq ($(profile), yes)
+  GSWAPP_EXTENSION=profile
+else
+  ifeq ($(debug), yes)
+    GSWAPP_EXTENSION=debug
+  else
+    GSWAPP_EXTENSION=gswa
+  endif
+endif
+
+ifeq ($(INTERNAL_gswapp_NAME),)
+# This part gets included by the first invoked make process.
+internal-all:: $(GSWAPP_NAME:=.all.gswapp.variables)
+
+internal-install:: $(GSWAPP_NAME:=.install.gswapp.variables)
+
+internal-uninstall:: $(GSWAPP_NAME:=.uninstall.gswapp.variables)
+
+internal-clean:: $(GSWAPP_NAME:=.clean.gswapp.variables)
+
+internal-distclean:: $(GSWAPP_NAME:=.distclean.gswapp.variables)
+
+$(GSWAPP_NAME):
+	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.gswapp.variables
+
+else
+
+# Libraries that go before the WO libraries
+ALL_GSW_LIBS = $(ADDITIONAL_GSW_LIBS) $(AUXILIARY_GSW_LIBS) $(GSW_LIBS) \
+	$(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS) \
+	$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \
+	$(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS)
+
+ALL_GSW_LIBS := \
+    $(shell $(WHICH_LIB_SCRIPT) $(LIB_DIRS_NO_SYSTEM) $(ALL_GSW_LIBS) \
+	debug=$(debug) profile=$(profile) shared=$(shared) libext=$(LIBEXT) \
+	shared_libext=$(SHARED_LIBEXT))
+
+
+# Don't include these definitions the first time make is invoked. This part is
+# included when make is invoked the second time from the %.build rule (see
+# rules.make).
+GSWAPP_DIR_NAME = $(INTERNAL_gswapp_NAME:=.$(GSWAPP_EXTENSION))
+GSWAPP_RESOURCE_DIRS =  $(foreach d, $(RESOURCE_DIRS), $(GSWAPP_DIR_NAME)/Resources/$(d))
+GSWAPP_WEBSERVER_RESOURCE_DIRS =  $(foreach d, $(WEBSERVER_RESOURCE_DIRS), $(GSWAPP_DIR_NAME)/WebServerResources/$(d))
+ifeq ($(strip $(COMPONENTS)),)
+  override COMPONENTS=""
+endif
+ifeq ($(strip $(RESOURCE_FILES)),)
+  override RESOURCE_FILES=""
+endif
+ifeq ($(strip $(WEBSERVER_RESOURCE_FILES)),)
+  override WEBSERVER_RESOURCE_FILES=""
+endif
+ifeq ($(strip $(LANGUAGES)),)
+  override LANGUAGES="English"
+endif
+ifeq ($(strip $(LOCALIZED_RESOURCE_FILES)),)
+  override LOCALIZED_RESOURCE_FILES=""
+endif
+ifeq ($(strip $(LOCALIZED_WEBSERVER_RESOURCE_FILES)),)
+  override LOCALIZED_WEBSERVER_RESOURCE_FILES=""
+endif
+
+# Support building NeXT applications
+ifneq ($(OBJC_COMPILER), NeXT)
+GSWAPP_FILE = \
+    $(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(INTERNAL_gswapp_NAME)$(EXEEXT)
+else
+GSWAPP_FILE = $(GSWAPP_DIR_NAME)/$(INTERNAL_gswapp_NAME)$(EXEEXT)
+endif
+
+#
+# Internal targets
+#
+
+$(GSWAPP_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
+	$(LD) $(ALL_LDFLAGS) -o $(LDOUT)$@ $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
+		$(SUBPROJECT_OBJ_FILES) \
+	    $(ALL_LIB_DIRS) $(ALL_GSW_LIBS)
+
+ifeq ($(OBJC_COMPILER), NeXT)
+	@$(TRANSFORM_PATHS_SCRIPT) `echo $(ALL_LIB_DIRS) | sed 's/-L//g'` \
+		>$(GSWAPP_DIR_NAME)/library_paths.openapp
+# This is a hack for OPENSTEP systems to remove the iconheader file
+# automatically generated by the makefile package.
+	rm -f $(INTERNAL_gswapp_NAME).iconheader
+else
+	@$(TRANSFORM_PATHS_SCRIPT) `echo $(ALL_LIB_DIRS) | sed 's/-L//g'` \
+	>$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)/library_paths.openapp
+endif
+
+#
+# Compilation targets
+#
+ifeq ($(OBJC_COMPILER), NeXT)
+internal-gswapp-all:: \
+	before-$(TARGET)-all \
+	$(GNUSTEP_OBJ_DIR) $(GSWAPP_DIR_NAME) $(GSWAPP_FILE) \
+	gswapp-components \
+	gswapp-localized-webresource-files \
+	gswapp-webresource-files \
+	gswapp-localized-resource-files \
+	gswapp-resource-files \
+	$(GSWAPP_DIR_NAME)/$(GSWAPP_NAME).sh \
+	after-$(TARGET)-all
+
+before-$(TARGET)-all::
+
+after-$(TARGET)-all::
+
+$(INTERNAL_gswapp_NAME).iconheader:
+	@(echo "F	$(INTERNAL_gswapp_NAME).$(GSWAPP_EXTENSION)	$(INTERNAL_gswapp_NAME)	$(GSWAPP_EXTENSION)"; \
+	  echo "F	$(INTERNAL_gswapp_NAME)	$(INTERNAL_gswapp_NAME)	app") >$@
+
+$(GSWAPP_DIR_NAME):
+	mkdir $@
+else
+
+internal-gswapp-all:: \
+   before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
+   $(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) $(GSWAPP_FILE) \
+   gswapp-components \
+   gswapp-localized-webresource-files \
+   gswapp-webresource-files \
+   gswapp-localized-resource-files \
+   gswapp-resource-files \
+   $(GSWAPP_DIR_NAME)/$(GSWAPP_NAME).sh \
+   after-$(TARGET)-all
+
+before-$(TARGET)-all::
+
+after-$(TARGET)-all::
+
+$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO):
+	@$(MKDIRS) $(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
+endif
+
+ifeq ($(GSWAPP_NAME)_GEN_SCRIPT,yes) #<==
+$(GSWAPP_DIR_NAME)/$(GSWAPP_NAME).sh: $(GSWAPP_DIR_NAME)
+	@(echo "#!/bin/sh"; \
+	  echo '# Automatically generated, do not edit!'; \
+	  echo '$${GNUSTEP_HOST_CPU}/$${GNUSTEP_HOST_OS}/$${LIBRARY_COMBO}/$(INTERNAL_gswapp_NAME) $$1 $$2 $$3 $$4 $$5 $$6 $$7 $$8') >$@
+	chmod +x $@
+else
+$(GSWAPP_DIR_NAME)/$(GSWAPP_NAME).sh:
+
+endif
+
+gswapp-components:: $(GSWAPP_DIR_NAME)
+	@(if [ "$(COMPONENTS)" != "" ]; then \
+	  	echo "Linking components into the application wrapper..."; \
+        cd $(GSWAPP_DIR_NAME)/Resources; \
+        for component in $(COMPONENTS); do \
+			if [ -d ../../$$component ]; then \
+		    	$(LN_S) -f ../../$$component ./;\
+			fi; \
+        done; \
+	  	echo "Linking localized components into the application wrapper..."; \
+        for l in $(LANGUAGES); do \
+	    	if [ ! -f $$l.lproj ]; then \
+				$(MKDIRS) $$l.lproj; fi; \
+	    	cd $$l.lproj; \
+	    	for f in $(COMPONENTS); do \
+				if [ -d ../../../$$l.lproj/$$f ]; then \
+					$(LN_S) -f ../../../$$l.lproj/$$f .;\
+				fi;\
+            done;\
+	    	cd ..; \
+		done;\
+	fi)
+
+gswapp-webresource-dir::
+	@$(MKDIRS) $(GSWAPP_WEBSERVER_RESOURCE_DIRS)
+
+gswapp-webresource-files:: $(GSWAPP_DIR_NAME)/WebServerResources gswapp-webresource-dir
+	@(if [ "$(WEBSERVER_RESOURCE_FILES)" != "" ]; then \
+	  echo "Linking webserver resources into the application wrapper..."; \
+          cd $(GSWAPP_DIR_NAME)/WebServerResources; \
+          for ff in $(WEBSERVER_RESOURCE_FILES); do \
+	    $(LN_S) -f ../../WebServerResources/$$ff .;\
+          done; \
+	fi)
+
+gswapp-localized-webresource-files:: $(GSWAPP_DIR_NAME)/WebServerResources gswapp-webresource-dir
+	@(if [ "$(LOCALIZED_WEBSERVER_RESOURCE_FILES)" != "" ]; then \
+	  echo "Linking localized web resources into the application wrapper..."; \
+          cd $(GSWAPP_DIR_NAME)/WebServerResources; \
+          for l in $(LANGUAGES); do \
+	    if [ ! -f $$l.lproj ]; then $(MKDIRS) $$l.lproj; fi; \
+	    cd $$l.lproj; \
+	    for f in $(LOCALIZED_WEBSERVER_RESOURCE_FILES); do \
+              if [ -f ../../../WebServerResources/$$l.lproj/$$f ]; then \
+                if [ ! -r $$f ]; then \
+		  $(LN_S) ../../../WebServerResources/$$l.lproj/$$f $$f;\
+		fi;\
+              fi;\
+            done;\
+	    cd ..; \
+          done;\
+	fi)
+
+gswapp-resource-dir::
+	@$(MKDIRS) $(GSWAPP_RESOURCE_DIRS)
+
+gswapp-resource-files:: $(GSWAPP_DIR_NAME)/Resources/Info-gnustep.plist gswapp-resource-dir
+	@(if [ "$(RESOURCE_FILES)" != "" ]; then \
+	  echo "Linking resources into the application wrapper..."; \
+          cd $(GSWAPP_DIR_NAME)/Resources/; \
+          for ff in $(RESOURCE_FILES); do \
+			echo $$ff; \
+		    $(LN_S) -f ../../$$ff .;\
+          done; \
+	fi)
+
+gswapp-localized-resource-files:: $(GSWAPP_DIR_NAME)/Resources gswapp-resource-dir
+	@(if [ "$(LOCALIZED_RESOURCE_FILES)" != "" ]; then \
+	  echo "Linking localized resources into the application wrapper..."; \
+          cd $(GSWAPP_DIR_NAME)/Resources; \
+          for l in $(LANGUAGES); do \
+	    if [ ! -f $$l.lproj ]; then $(MKDIRS) $$l.lproj; fi; \
+	    cd $$l.lproj; \
+	    for f in $(LOCALIZED_RESOURCE_FILES); do \
+              if [ -f ../../../$$l.lproj/$$f ]; then \
+					echo $$l.lproj/$$ff; \
+		$(LN_S) -f ../../../$$l.lproj/$$f .;\
+              fi;\
+            done;\
+	    cd ..; \
+          done;\
+	fi)
+
+$(GSWAPP_DIR_NAME)/Resources/Info-gnustep.plist: $(GSWAPP_DIR_NAME)/Resources
+	@(echo "{"; echo '  NOTE = "Automatically generated, do not edit!";'; \
+	  echo "  NSExecutable = \"$(INTERNAL_gswapp_NAME)\";"; \
+	  echo "  NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
+	  if [ "$(HAS_GSWCOMPONENTS)" != "" ]; then \
+			  echo "  HasGSWComponents = \"$(HAS_GSWCOMPONENTS)\";"; \
+	  fi; \
+	  if [ "$(MAIN_MODEL_FILE)" = "" ]; then \
+	    echo "  NSMainNibFile = \"\";"; \
+	  else \
+	    echo "  NSMainNibFile = \"`echo $(MAIN_MODEL_FILE) | sed 's/.gmodel//'`\";"; \
+	  fi; \
+	  if [ -r "$(INTERNAL_gswapp_NAME)Info.plist" ]; then \
+	    cat $(INTERNAL_gswapp_NAME)Info.plist; \
+	  fi; \
+	  if [ "$(GSWAPP_INFO_PLIST)" != "" ]; then \
+	    cat $(GSWAPP_INFO_PLIST); \
+	  fi; \
+	  echo "}") >$@
+
+$(GSWAPP_DIR_NAME)/Resources:
+	@$(MKDIRS) $@
+
+$(GSWAPP_DIR_NAME)/WebServerResources:
+	@$(MKDIRS) $@
+
+internal-gswapp-install:: internal-gswapp-all
+	@$(MKDIRS) $(GNUSTEP_GSWAPPS)
+	rm -rf $(GNUSTEP_GSWAPPS)/$(GSWAPP_DIR_NAME)
+	$(TAR) chf --exclude=CVS $(GSWAPP_DIR_NAME) | (cd $(GNUSTEP_GSWAPPS); $(TAR) xf -)
+
+#	$(TAR) ch --exclude=CVS --to-stdout $(GSWAPP_DIR_NAME) | (cd $(GNUSTEP_GSWAPPS); $(TAR) xf -)
+
+internal-gswapp-uninstall::
+	(cd $(GNUSTEP_GSWAPPS); rm -rf $(GSWAPP_DIR_NAME))
+
+#
+# Cleaning targets
+#
+internal-gswapp-clean::
+	rm -rf $(GNUSTEP_OBJ_PREFIX)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)
+ifeq ($(OBJC_COMPILER), NeXT)
+	rm -f *.iconheader
+	for f in *.$(GSWAPP_EXTENSION); do \
+	  rm -f $$f/`basename $$f .$(GSWAPP_EXTENSION)`; \
+	done
+else
+	rm -rf *.$(GSWAPP_EXTENSION)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)
+endif
+
+
+internal-gswapp-distclean::
+	rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
+	  static_debug_obj static_profile_obj shared_profile_debug_obj \
+	  static_profile_debug_obj *.gswa *.debug *.profile *.iconheader
+
+endif
+
+endif
+
+## Local variables:
+## mode: makefile
+## End:
diff --git a/gswbundle.make b/gswbundle.make
new file mode 100644
index 000000000..5f50292ff
--- /dev/null
+++ b/gswbundle.make
@@ -0,0 +1,294 @@
+#
+#   gswbundle.make
+#
+#   Makefile rules to build GNUstep-based bundles.
+#
+#   Copyright (C) 1997 Free Software Foundation, Inc.
+#
+#   Author:  Manuel Guesdon <mguesdon@sbuilders.com>
+#   Based on WOBundle.make by Helge Hess, MDlink online service center GmbH.
+#   Based on bundle.make by Ovidiu Predescu <ovidiu@net-community.com>
+#
+#   This file is part of the GNUstep Makefile Package.
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License
+#   as published by the Free Software Foundation; either version 2
+#   of the License, or (at your option) any later version.
+#   
+#   You should have received a copy of the GNU General Public
+#   License along with this library; see the file COPYING.LIB.
+#   If not, write to the Free Software Foundation,
+#   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# prevent multiple inclusions
+ifeq ($(GSWBUNDLE_MAKE_LOADED),)
+GSWBUNDLE_MAKE_LOADED=yes
+
+#
+# Include in the common makefile rules
+#
+include $(GNUSTEP_MAKEFILES)/rules.make
+
+#TODO: move this
+TAR=tar
+LN_S=ln -s 
+GSWBUNDLE_LD= $(BUNDLE_LD)
+GSWBUNDLE_LDFLAGS = $(BUNDLE_LDFLAGS)
+
+ifeq ($(GSWBUNDLE_INSTALL_DIR),)
+GSWBUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Librairies
+endif
+# The name of the bundle is in the BUNDLE_NAME variable.
+# The list of languages the bundle is localized in are in xxx_LANGUAGES
+# The list of bundle resource file are in xxx_RESOURCE_FILES
+# The list of localized bundle resource file are in xxx_LOCALIZED_RESOURCE_FILES
+# The list of bundle resource directories are in xxx_RESOURCE_DIRS
+# The name of the principal class is xxx_PRINCIPAL_CLASS
+# The header files are in xxx_HEADER_FILES
+# The directory where the header files are located is xxx_HEADER_FILES_DIR
+# The directory where to install the header files inside the library
+# installation directory is xxx_HEADER_FILES_INSTALL_DIR
+# where xxx is the bundle name
+#  xxx_WEBSERVER_RESOURCE_DIRS <==
+# The list of localized application web server resource directories are in 
+#  xxx_LOCALIZED_WEBSERVER_RESOURCE_DIRS
+# where xxx is the application name <==
+
+GSWBUNDLE_NAME:=$(strip $(GSWBUNDLE_NAME))
+
+ifeq ($(INTERNAL_bundle_NAME),)
+# This part is included the first time make is invoked.
+
+internal-all:: $(GSWBUNDLE_NAME:=.all.bundle.variables)
+
+internal-install:: all $(GSWBUNDLE_NAME:=.install.bundle.variables)
+
+internal-uninstall:: $(GSWBUNDLE_NAME:=.uninstall.bundle.variables)
+
+internal-clean:: $(GSWBUNDLE_NAME:=.clean.bundle.variables)
+
+internal-distclean:: $(GSWBUNDLE_NAME:=.distclean.bundle.variables)
+
+$(GSWBUNDLE_NAME):
+	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
+		$@.all.bundle.variables
+
+else
+# This part gets included the second time make is invoked.
+
+# On Solaris we don't need to specifies the libraries the bundle needs.
+# How about the rest of the systems? ALL_BUNDLE_LIBS is temporary empty.
+#ALL_GSWBUNDLE_LIBS = $(ADDITIONAL_GSW_LIBS) $(AUXILIARY_GSW_LIBS) $(GSW_LIBS) \
+	$(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS) \
+	$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \
+	$(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS)
+#ALL_GSWBUNDLE_LIBS = 
+#ALL_GSWBUNDLE_LIBS := \
+    $(shell $(WHICH_LIB_SCRIPT) $(LIB_DIRS_NO_SYSTEM) $(ALL_GSWBUNDLE_LIBS) \
+	debug=$(debug) profile=$(profile) shared=$(shared) libext=$(LIBEXT) \
+	shared_libext=$(SHARED_LIBEXT))
+
+internal-bundle-all:: before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
+		build-bundle-dir build-bundle \
+		after-$(TARGET)-all
+
+before-$(TARGET)-all::
+
+after-$(TARGET)-all::
+
+GSWBUNDLE_DIR_NAME := $(INTERNAL_bundle_NAME:=$(GSWBUNDLE_EXTENSION))
+GSWBUNDLE_FILE := \
+    $(GSWBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(GSWBUNDLE_NAME)
+GSWBUNDLE_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(GSWBUNDLE_DIR_NAME)/Resources/$(d))
+GSWBUNDLE_WEBSERVER_RESOURCE_DIRS =  $(foreach d, $(WEBSERVER_RESOURCE_DIRS), $(GSWBUNDLE_DIR_NAME)/WebServerResources/$(d))
+
+ifeq ($(strip $(HEADER_FILES_DIR)),)
+HEADER_FILES_DIR = .
+endif
+
+ifeq ($(strip $(COMPONENTS)),)
+  override COMPONENTS=""
+endif
+ifeq ($(strip $(RESOURCE_FILES)),)
+  override RESOURCE_FILES=""
+endif
+ifeq ($(strip $(WEBSERVER_RESOURCE_FILES)),)
+  override WEBSERVER_RESOURCE_FILES=""
+endif
+ifeq ($(strip $(LOCALIZED_RESOURCE_FILES)),)
+  override LOCALIZED_RESOURCE_FILES=""
+endif
+ifeq ($(strip $(LOCALIZED_WEBSERVER_RESOURCE_FILES)),)
+  override LOCALIZED_WEBSERVER_RESOURCE_FILES=""
+endif
+ifeq ($(strip $(LANGUAGES)),)
+  override LANGUAGES="English"
+endif
+
+build-bundle-dir::
+	@$(MKDIRS) \
+		$(GSWBUNDLE_DIR_NAME)/Resources \
+		$(GSWBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) \
+		$(GSWBUNDLE_RESOURCE_DIRS)
+
+build-bundle:: $(GSWBUNDLE_FILE) gswbundle-components gswbundle-resource-files localized-gswbundle-resource-files gswbundle-localized-webresource-files gswbundle-webresource-files
+
+
+$(GSWBUNDLE_FILE) : $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) 
+		$(GSWBUNDLE_LD) $(GSWBUNDLE_LDFLAGS) $(ALL_LDFLAGS) -o $(LDOUT)$(GSWBUNDLE_FILE) \
+		$(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES) \
+		$(ALL_LIB_DIRS) $(ALL_GSWBUNDLE_LIBS)
+
+gswbundle-components :: $(GSWBUNDLE_DIR_NAME)
+	@(if [ "$(COMPONENTS)" != "" ]; then \
+	  	echo "Linking components into the bundle wrapper..."; \
+        cd $(GSWBUNDLE_DIR_NAME)/Resources; \
+        for component in $(COMPONENTS); do \
+			if [ -d ../../$$component ]; then \
+		    	$(LN_S) -f ../../$$component ./;\
+			fi; \
+        done; \
+	  	echo "Linking localized components into the bundle wrapper..."; \
+        for l in $(LANGUAGES); do \
+	    	if [ ! -f $$l.lproj ]; then \
+				$(MKDIRS) $$l.lproj; fi; \
+	    	cd $$l.lproj; \
+	    	for f in $(COMPONENTS); do \
+				if [ -d ../../../$$l.lproj/$$f ]; then \
+					$(LN_S) -f ../../../$$l.lproj/$$f .;\
+				fi;\
+            done;\
+	    	cd ..; \
+		done;\
+	fi)
+
+gswbundle-resource-files:: $(GSWBUNDLE_DIR_NAME)/bundle-info.plist $(GSWBUNDLE_DIR_NAME)/Resources/Info-gnustep.plist
+	@(if [ "$(RESOURCE_FILES)" != "" ]; then \
+	  echo "Linking resources into the bundle wrapper..."; \
+          cd $(GSWBUNDLE_DIR_NAME)/Resources/; \
+          for ff in $(RESOURCE_FILES); do \
+	    $(LN_S) -f ../../$$ff .;\
+          done; \
+	fi)
+
+localized-gswbundle-resource-files:: $(GSWBUNDLE_DIR_NAME)/Resources/Info-gnustep.plist
+	@(if [ "$(LOCALIZED_RESOURCE_FILES)" != "" ]; then \
+	  echo "Linking localized resources into the bundle wrapper..."; \
+          cd $(GSWBUNDLE_DIR_NAME)/Resources; \
+          for l in $(LANGUAGES); do \
+	    if [ ! -f $$l.lproj ]; then $(MKDIRS) $$l.lproj; fi; \
+	    cd $$l.lproj; \
+	    for f in $(LOCALIZED_RESOURCE_FILES); do \
+              if [ -f ../../../$$l.lproj/$$f ]; then \
+		$(LN_S) -f ../../../$$l.lproj/$$f .;\
+              fi;\
+            done;\
+	    cd ..; \
+          done;\
+	fi)
+
+gswbundle-webresource-dir::
+	@$(MKDIRS) $(GSWBUNDLE_WEBSERVER_RESOURCE_DIRS)
+
+gswbundle-webresource-files:: $(GSWBUNDLE_DIR_NAME)/WebServerResources gswbundle-webresource-dir
+	@(if [ "$(WEBSERVER_RESOURCE_FILES)" != "" ]; then \
+	  echo "Linking webserver resources into the application wrapper..."; \
+          cd $(GSWBUNDLE_DIR_NAME)/WebServerResources; \
+          for ff in $(WEBSERVER_RESOURCE_FILES); do \
+	    $(LN_S) -f ../../WebServerResources/$$ff .;\
+          done; \
+	fi)
+
+gswbundle-localized-webresource-files:: $(GSWBUNDLE_DIR_NAME)/WebServerResources gswbundle-webresource-dir
+	@(if [ "$(LOCALIZED_WEBSERVER_RESOURCE_FILES)" != "" ]; then \
+	  echo "Linking localized web resources into the application wrapper..."; \
+          cd $(GSWBUNDLE_DIR_NAME)/WebServerResources; \
+          for l in $(LANGUAGES); do \
+	    if [ ! -f $$l.lproj ]; then $(MKDIRS) $$l.lproj; fi; \
+	    cd $$l.lproj; \
+	    for f in $(LOCALIZED_WEBSERVER_RESOURCE_FILES); do \
+              if [ -f ../../../WebServerResources/$$l.lproj/$$f ]; then \
+                if [ ! -r $$f ]; then \
+		  $(LN_S) ../../../WebServerResources/$$l.lproj/$$f $$f;\
+		fi;\
+              fi;\
+            done;\
+	    cd ..; \
+          done;\
+	fi)
+
+ifeq ($(PRINCIPAL_CLASS),)
+override PRINCIPAL_CLASS = $(INTERNAL_bundle_NAME)
+endif
+
+$(GSWBUNDLE_DIR_NAME)/bundle-info.plist: $(GSWBUNDLE_DIR_NAME)
+	@(cd $(GSWBUNDLE_DIR_NAME); \
+	  $(LN_S) -f ../bundle-info.plist . \
+	)
+
+$(GSWBUNDLE_DIR_NAME)/Resources/Info-gnustep.plist: $(GSWBUNDLE_DIR_NAME)/Resources
+	@(echo "{"; echo '  NOTE = "Automatically generated, do not edit!";'; \
+	  echo "  NSExecutable = \"$(INTERNAL_bundle_NAME)\";"; \
+	  echo "  NSPrincipalClass = \"$(PRINCIPAL_CLASS)\";"; \
+	  if [ "$(HAS_GSWCOMPONENTS)" != "" ]; then \
+			  echo "  HasGSWComponents = \"$(HAS_GSWCOMPONENTS)\";"; \
+	  fi; \
+	  echo "}") >$@
+
+$(GSWBUNDLE_DIR_NAME)/Resources:
+	@$(MKDIRS) $@
+
+$(GSWBUNDLE_DIR_NAME)/WebServerResources:
+	@$(MKDIRS) $@
+
+internal-bundle-install:: $(GSWBUNDLE_INSTALL_DIR)
+	if [ "$(HEADER_FILES_INSTALL_DIR)" != "" ]; then \
+	  $(MKDIRS) $(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR); \
+	  if [ "$(HEADER_FILES)" != "" ]; then \
+	    for file in $(HEADER_FILES) __done; do \
+	      if [ $$file != __done ]; then \
+	        $(INSTALL_DATA) $(HEADER_FILES_DIR)/$$file \
+		 $(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)/$$file ; \
+	      fi; \
+	    done; \
+	  fi; \
+        fi
+	$(MKDIRS) $(GSWBUNDLE_INSTALL_DIR)
+	rm -rf $(GSWBUNDLE_INSTALL_DIR)/$(GSWBUNDLE_DIR_NAME)
+	$(TAR) chf --exclude=CVS $(GSWBUNDLE_DIR_NAME) | (cd $(GSWBUNDLE_INSTALL_DIR); $(TAR) xf -)
+
+#	$(TAR) ch --exclude=CVS --to-stdout $(GSWBUNDLE_DIR_NAME) | (cd $(GSWBUNDLE_INSTALL_DIR); $(TAR) xf -)
+
+$(GSWBUNDLE_INSTALL_DIR)::
+	@$(MKDIRS) $@
+
+internal-bundle-uninstall::
+	if [ "$(HEADER_FILES)" != "" ]; then \
+	  for file in $(HEADER_FILES) __done; do \
+	    if [ $$file != __done ]; then \
+	      rm -rf $(GNUSTEP_HEADERS)$(HEADER_FILES_INSTALL_DIR)/$$file ; \
+	    fi; \
+	  done; \
+	fi; \
+	rm -rf $(GSWBUNDLE_INSTALL_DIR)/$(GSWBUNDLE_DIR_NAME)
+
+#
+# Cleaning targets
+#
+internal-bundle-clean::
+	rm -rf $(GNUSTEP_OBJ_DIR) $(GSWBUNDLE_DIR_NAME)
+
+internal-bundle-distclean::
+	rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
+	  static_debug_obj static_profile_obj shared_profile_debug_obj \
+	  static_profile_debug_obj
+
+endif
+
+endif
+# bundle.make loaded
+
+## Local variables:
+## mode: makefile
+## End:
diff --git a/rules.make b/rules.make
index d51b3e288..82afc56c0 100644
--- a/rules.make
+++ b/rules.make
@@ -156,6 +156,7 @@ ifeq ($(strip $(BUNDLE_EXTENSION)),)
 BUNDLE_EXTENSION = .bundle
 endif
 
+
 # General rules
 VPATH = .
 
@@ -182,8 +183,8 @@ $(JAVA_OBJ_PREFIX)%.class : %.java
 %.build:
 	@(echo Making $(OPERATION) for $(TARGET_TYPE) $*...; \
         tmp="$($*_SUBPROJECTS)"; \
-        if test "x$$tmp" != x ; then \
-          for f in $$tmp; do \
+        if test "x$(tmp)" != x ; then \
+          for f in $tmp; do \
 	    mf=$(MAKEFILE_NAME); \
 	    if [ ! -f $$f/$$mf -a -f $$f/Makefile ]; then \
 	      mf=Makefile; \
@@ -202,6 +203,7 @@ $(JAVA_OBJ_PREFIX)%.class : %.java
 	    OBJC_FILES="$($*_OBJC_FILES)" \
 	    C_FILES="$($*_C_FILES)" \
 		JAVA_FILES="$($*_JAVA_FILES)" \
+		JAVA_JOBS_FILES="$($*_JOBS_FILES)" \
 		JAVA_WRAPPER_FRAMEWORK="$($*_WRAPPER_FRAMEWORK)" \
 	    PSWRAP_FILES="$($*_PSWRAP_FILES)" \
 	    HEADER_FILES="$($*_HEADER_FILES)" \
@@ -210,12 +212,17 @@ $(JAVA_OBJ_PREFIX)%.class : %.java
 	    HEADER_FILES_DIR="$($*_HEADER_FILES_DIR)" \
 	    HEADER_FILES_INSTALL_DIR="$($*_HEADER_FILES_INSTALL_DIR)" \
 	    RESOURCE_FILES="$($*_RESOURCE_FILES)" \
+	    WEBSERVER_RESOURCE_FILES="$($*_WEBSERVER_RESOURCE_FILES)" \
+		LOCALIZED_RESOURCE_FILES="$($*_LOCALIZED_RESOURCE_FILES)" \
+		LOCALIZED_WEBSERVER_RESOURCE_FILES="$($*_LOCALIZED_WEBSERVER_RESOURCE_FILES)" \
 	    MAIN_MODEL_FILE="$($*_MAIN_MODEL_FILE)" \
 	    APPLICATION_ICON="$($*_APPLICATION_ICON)" \
 	    RESOURCE_DIRS="$($*_RESOURCE_DIRS)" \
+		COMPONENTS="$($*_COMPONENTS)" \
+		LANGUAGES="$($*_LANGUAGES)" \
+		HAS_GSWCOMPONENTS="$($*_HAS_GSWCOMPONENTS)" \
+		GSWAPP_INFO_PLIST="$($*_GSWAPP_INFO_PLIST)" \
 	    BUNDLE_LIBS="$($*_BUNDLE_LIBS) $(BUNDLE_LIBS)" \
-	    PALETTE_LIBS="$($*_PALETTE_LIBS) $(PALETTE_LIBS)" \
-	    PALETTE_ICON="$($*_PALETTE_ICON)" \
 	    SERVICE_INSTALL_DIR="$($*_SERVICE_INSTALL_DIR)" \
 	    PRINCIPAL_CLASS="$($*_PRINCIPAL_CLASS)" \
 	    ADDITIONAL_INCLUDE_DIRS="$(ADDITIONAL_INCLUDE_DIRS) \