diff --git a/Makefile b/Makefile
index 3d7243b9f8..7c8200e157 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/11/01]
 #
 default: help
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@@ -205,7 +205,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=fpc
-override PACKAGE_VERSION=1.1.0-1
+override PACKAGE_VERSION=1.9.0
 ifndef inOS2
 override FPCDIR:=$(BASEDIR)
 export FPCDIR
@@ -2227,9 +2227,9 @@ ifdef inUnix
 ifneq ($(wildcard $(CVSINSTALL)/fpc.spec),)
 .PHONY: rpmcopy rpm
 RPMFPCVERSION:=$(shell grep '^Version:' $(CVSINSTALL)/fpc.spec | awk '{ print $$2 }')
-RPMBUILD=$(shell which rpmbuild)
+RPMBUILD=$(strip $(wildcard $(addsuffix /rpmbuild,$(SEARCHPATH))))
 ifeq ($(RPMBUILD),)
-RPMBUILD=rpm
+RPMBUILD=$(strip $(wildcard $(addsuffix /rpm,$(SEARCHPATH))))
 endif
 REDHATDIR=/usr/src/redhat
 ifeq ($(wildcard REDHATDIR),)
diff --git a/Makefile.fpc b/Makefile.fpc
index f9094f1b5a..b0cda2b375 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -4,7 +4,7 @@
 
 [package]
 name=fpc
-version=1.1.0-1
+version=1.9.0
 
 [target]
 dirs=compiler rtl utils fcl fv packages ide installer
@@ -592,9 +592,9 @@ ifneq ($(wildcard $(CVSINSTALL)/fpc.spec),)
 RPMFPCVERSION:=$(shell grep '^Version:' $(CVSINSTALL)/fpc.spec | awk '{ print $$2 }')
 
 # Only the recent rpms have rpmbuild
-RPMBUILD=$(shell which rpmbuild)
+RPMBUILD=$(strip $(wildcard $(addsuffix /rpmbuild,$(SEARCHPATH))))
 ifeq ($(RPMBUILD),)
-RPMBUILD=rpm
+RPMBUILD=$(strip $(wildcard $(addsuffix /rpm,$(SEARCHPATH))))
 endif
 REDHATDIR=/usr/src/redhat
 # Debian has /usr/src/rpm
@@ -612,7 +612,7 @@ rpmcopy: distclean
         rm -rf $(RPMSRCDIR)
         cp $(CVSINSTALL)/fpc.spec $(RPMSPECDIR)/fpc-$(RPMFPCVERSION).spec
 ifndef NODOCS
- 	cat $(CVSINSTALL)/fpcdoc.spec >> $(RPMSPECDIR)/fpc-$(RPMFPCVERSION).spec
+        cat $(CVSINSTALL)/fpcdoc.spec >> $(RPMSPECDIR)/fpc-$(RPMFPCVERSION).spec
 endif
         install -d $(RPMSRCDIR)
         $(COPYTREE) compiler $(RPMSRCDIR)
@@ -625,8 +625,8 @@ endif
         $(COPYTREE) Makefile* $(RPMSRCDIR)
         $(COPYTREE) $(CVSINSTALL)/man $(RPMSRCDIR)
         $(COPYTREE) $(CVSINSTALL)/doc $(RPMSRCDIR)
-	$(COPY) $(CVSINSTALL)/smart_strip.sh $(RPMSRCDIR)
-	chmod +x $(RPMSRCDIR)/smart_strip.sh
+        $(COPY) $(CVSINSTALL)/smart_strip.sh $(RPMSRCDIR)
+        chmod +x $(RPMSRCDIR)/smart_strip.sh
 ifndef NODOCS
         $(COPYTREE) docs $(RPMSRCDIR)
 endif
diff --git a/compiler/sparc/cpubase.pas b/compiler/sparc/cpubase.pas
index 1e3ec1e82e..0155237c46 100644
--- a/compiler/sparc/cpubase.pas
+++ b/compiler/sparc/cpubase.pas
@@ -550,7 +550,7 @@ implementation
 
     function findreg_by_number(r:Tregister):tregisterindex;
       begin
-        rgBase.findreg_by_number_table(r,regnumber_index);
+        result:=findreg_by_number_table(r,regnumber_index);
       end;
 
 
@@ -558,7 +558,7 @@ implementation
       var
         p : tregisterindex;
       begin
-        p:=rgBase.findreg_by_number_table(r,regnumber_index);
+        p:=findreg_by_number_table(r,regnumber_index);
         if p<>0 then
           result:=std_regname_table[p]
         else
@@ -568,7 +568,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.55  2003-10-31 08:47:13  mazen
+  Revision 1.56  2003-11-01 19:27:54  peter
+    * 1.9.0
+
+  Revision 1.55  2003/10/31 08:47:13  mazen
   * rgHelper renamed to rgBase
   * using findreg_by_<name|number>_table directly to decrease heap overheading
 
diff --git a/install/debian/changelog b/install/debian/changelog
index ca46e8c742..0bd8649d14 100644
--- a/install/debian/changelog
+++ b/install/debian/changelog
@@ -1,8 +1,8 @@
-fpc (1.1.0-1) unstable; urgency=low
+fpc (1.9.0-1) unstable; urgency=low
 
-  * New Snapshot.
+  * First beta release for 2.0
 
- -- Mazen NEIFER <mazen@freepascal.org>  Thu,  14 Aug 2003 11:54:50 +0100
+ -- Peter Vreman <peter@freepascal.org>  Sat,  1 Nov 2003 22:00:00 +0100
 
 fpc (1.0.6-20020228) unstable; urgency=low
 
diff --git a/install/fpc.spec b/install/fpc.spec
index aa2206aab2..b0adcc81a7 100644
--- a/install/fpc.spec
+++ b/install/fpc.spec
@@ -1,5 +1,5 @@
 Name: fpc
-Version: 1.1
+Version: 1.9.0
 Release: 0
 ExclusiveArch: i386 i586 i686
 Copyright: GPL
@@ -92,7 +92,9 @@ fi
 	make packages_clean
 	make fcl_clean
 	make utils_clean
+if [ -z ${NODOCS} ]; then
 	make -C docs clean
+fi
 
 if [ %{buildroot} != "/" ]; then
 	rm -rf %{buildroot}
diff --git a/install/install.sh b/install/install.sh
index 707c538e50..2c3c999334 100644
--- a/install/install.sh
+++ b/install/install.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 #
 # Free Pascal installation script for Linux.
-# Copyright 1996-2000 Michael Van Canneyt and Peter Vreman
+# Copyright 1996-2002 Michael Van Canneyt and Peter Vreman
 #
 # Don't edit this file. 
 # Everything can be set when the script is run.
 #
 
 # Release Version
-VERSION=1.0.4
+VERSION=1.9.0
 
 # some useful functions
 # ask displays 1st parameter, and ask new value for variable, whose name is
@@ -94,42 +94,50 @@ makedirhierarch $PREFIX
 # Set some defaults.
 LIBDIR=$PREFIX/lib/fpc/$VERSION
 SRCDIR=$PREFIX/src/fpc-$VERSION
-DOCDIR=$PREFIX/doc/fpc-$VERSION
-MANDIR=$PREFIX/man
-DEMODIR=$DOCDIR/examples
 EXECDIR=$PREFIX/bin
+OSNAME=`uname -s | tr A-Z a-z`
+
+BSDHIER=0
+case $OSNAME in 
+*bsd)
+  BSDHIER=1;;
+esac
+
+
+if [ "${BSDHIER}" = "1" ]; then
+DOCDIR=$PREFIX/share/doc/fpc-$VERSION
+else
+DOCDIR=$PREFIX/doc/fpc-$VERSION
+fi
+
+echo $DOCDIR
+
+DEMODIR=$DOCDIR/examples
 
 # Install compiler/RTL. Mandatory.
 echo Unpacking ...
 tar xf binary.tar
 echo Installing compiler and RTL ...
-unztar baselinux.tar.gz $PREFIX
+unztar base${OSNAME}.tar.gz $PREFIX
 rm -f $EXECDIR/ppc386
 ln -sf $LIBDIR/ppc386 $EXECDIR/ppc386
 echo Installing utilities...
-unztar utillinux.tar.gz $PREFIX
+unztar util${OSNAME}.tar.gz $PREFIX
 if yesno "Install FCL"; then
-    unztar unitsfcllinux.tar.gz $PREFIX
+    unztar unitsfcl${OSNAME}.tar.gz $PREFIX
 fi
-if yesno "Install API"; then
-    unztar unitsapilinux.tar.gz $PREFIX
+if yesno "Install packages"; then
+  for f in units*.tar.gz 
+  do
+    if [ $f != unitsfcl${OSNAME}.tar.gz ]; then
+      basename $f .tar.gz |\
+      sed -e s/units// -e s/${OSNAME}// |\
+      xargs echo Installing 
+      unztar $f $PREFIX
+    fi
+  done
 fi
-if yesno "Install Base (zlib,ncurses,x11) Packages"; then
-    unztar unitsbaselinux.tar.gz $PREFIX
-fi
-if yesno "Install Net (inet,uncgi) Packages"; then
-    unztar unitsnetlinux.tar.gz $PREFIX
-fi
-if yesno "Install Database (mysql,interbase,postgres) Packages"; then
-    unztar unitsdblinux.tar.gz $PREFIX
-fi
-if yesno "Install Graphics (svgalib,opengl,ggi,forms) Packages"; then
-    unztar unitsgfxlinux.tar.gz $PREFIX
-fi
-if yesno "Install Misc (utmp,paszlib) Packages"; then
-    unztar unitsmisclinux.tar.gz $PREFIX
-fi
-rm -f *linux.tar.gz
+rm -f *${OSNAME}.tar.gz
 echo Done.
 echo
 
@@ -148,14 +156,20 @@ if yesno "Install sources"; then
   if yesno "Install FCL source"; then
     unztar fclsrc.tar.gz $PREFIX
   fi    
-  if yesno "Install API source"; then
-    unztar apisrc.tar.gz $PREFIX
+  if yesno "Install IDE source"; then
+    unztar idesrc.tar.gz $PREFIX
+  fi    
+  if yesno "Install installer source"; then
+    unztar installersrc.tar.gz $PREFIX
   fi    
   if yesno "Install Packages source"; then
-    unztar packagessrc.tar.gz $PREFIX
-  fi    
-  if yesno "Install Utils source"; then
-    unztar utilsrc.tar.gz $PREFIX
+    for f in units*src.tar.gz 
+    do
+      basename $f .tar.gz |\
+      sed -e s/units// -e s/src// |\
+      xargs echo Installing sources for 
+      unztar $f $PREFIX
+    done
   fi    
   rm -f *src.tar.gz
   echo Done.
@@ -170,14 +184,6 @@ if yesno "Install documentation"; then
 fi
 echo
 
-# Install the documentation. Optional.
-if yesno "Install manual pages"; then
-  echo Installing documentation in $MANDIR ...
-  unztar man.tar.gz $PREFIX
-  echo Done.
-fi
-echo
-
 # Install the demos. Optional.
 if yesno "Install demos"; then
   ask "Install demos in" DEMODIR
diff --git a/install/makepack b/install/makepack
index 6c234b9401..cf174063a5 100644
--- a/install/makepack
+++ b/install/makepack
@@ -5,7 +5,7 @@
 #
 
 # Version
-VERSION=1.0.4
+VERSION=1.9.0
 RELEASE=ELF
 
 unset FPCDIR
@@ -14,24 +14,54 @@ unset FPCDIR
 [ -d install ] || cd ..
 
 make linuxzip
-make sourcezip
-make docsrc
+if [ $? != 0 ]; then
+  echo Failed to make distribution archive.
+  exit 1
+fi
 make docs
+if [ $? != 0 ]; then
+  echo Failed to make documentation archive.
+  exit 1
+fi
+make sourcezip
+if [ $? != 0 ]; then
+  echo Failed to make source archive.
+  exit 1
+fi
+make docsrc
+if [ $? != 0 ]; then
+  echo Failed to make documentation source archive.
+  exit 1
+fi
 make demozip
+if [ $? != 0 ]; then
+  echo Failed to make demo source archive.
+  exit 1
+fi
 
 SOURCES=`/bin/ls *src.tar.gz`
 FILES=`/bin/ls *linux.tar.gz *exm.tar.gz`
-RELFILES="binary.tar sources.tar demo.tar.gz docs.tar.gz man.tar.gz install.sh"
+RELFILES="binary.tar sources.tar demo.tar.gz docs.tar.gz install.sh"
 
 echo Creating binary.tar
 tar cf binary.tar $FILES
+if [ $? != 0 ]; then
+  echo Failed to create binary.tar
+  exit 1
+fi
 echo Creating sources.tar
 tar cf sources.tar $SOURCES
-echo Creating man.tar.gz
-(cd install; tar czf ../man.tar.gz man/man1/*.1 man/man5/*.5)
+if [ $? != 0 ]; then
+  echo Failed to create sources.tar
+  exit 1
+fi
 echo Copying install.sh
 cp install/install.sh .
 chmod 755 install.sh
 
 echo Creating fpc-$VERSION.$RELEASE.tar
 tar cf fpc-$VERSION.$RELEASE.tar $RELFILES
+if [ $? != 0 ]; then
+  echo Failed to create fpc-$VERSION.$RELEASE.tar
+  exit 1
+fi