diff --git a/xpfe/bootstrap/mozilla b/xpfe/bootstrap/mozilla
index 67b7b74565d..0a168f5e5f0 100755
--- a/xpfe/bootstrap/mozilla
+++ b/xpfe/bootstrap/mozilla
@@ -16,7 +16,7 @@
 # Reserved.
 #
 
-## $Id: mozilla,v 1.9 2000-10-25 20:32:36 cls%seawood.org Exp $
+## $Id: mozilla,v 1.10 2001-01-23 15:34:56 cls%seawood.org Exp $
 ## 
 ## Usage:
 ##
@@ -38,6 +38,10 @@ moreargs=""
 debugging=0
 MOZILLA_BIN="mozilla-bin"
 
+if [ "$OSTYPE" = "beos" ]; then
+  mimeset -F $MOZILLA_BIN
+fi
+
 while [ $# -gt 0 ]
 do
   case "$1" in
diff --git a/xpinstall/packager/Makefile.in b/xpinstall/packager/Makefile.in
index a3c52109c93..9cbc685f9c5 100644
--- a/xpinstall/packager/Makefile.in
+++ b/xpinstall/packager/Makefile.in
@@ -82,6 +82,7 @@ STRIP_FLAGS	= -f
 endif
 ifeq ($(OS_ARCH),BeOS)
 STRIP_FLAGS	= -g
+PLATFORM_EXCLUDE_LIST = ! -name "*.stub" ! -name "mozilla-bin"
 endif
 
 all export libs install:: $(TARGETS)
@@ -96,12 +97,7 @@ endif
 # NOTE: this must be a cp now that dist links into the tree so that we
 # do not strip the binaries actually in the tree.
 	@echo "Creating package directory..."
-# Only zip/unzip preserve BeOS' special file attributes
-ifeq ($(OS_ARCH),BeOS)
-	@copyattr -v -d -r $(DIST)/bin $(DIST)/package
-else
 	@cp -rp ${DIST}/bin $(DIST)/package
-endif
 	@echo "Stripping package directory..."
 	@cd $(DIST)/package; find . ! -type d \
 			! -name "*.js" \
@@ -124,7 +120,7 @@ endif
 			! -name "*.tbl" \
 			! -name "*.src" \
 			! -name "*.reg" \
-			! -name "*.stub" \
+			$(PLATFORM_EXCLUDE_LIST) \
 			-exec $(STRIP) $(STRIP_FLAGS) {} >/dev/null 2>&1 \;
 ifeq ($(MOZ_PKG_FORMAT),TGZ)
 	cd $(DIST); tar -cvhf - package | gzip -vf9 > $@