diff --git a/.gitattributes b/.gitattributes
index f67d96b4d3..adabcf3754 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2552,7 +2552,6 @@ tools/install/create_lazarus_deb.sh svneol=native#text/plain
 tools/install/create_lazarus_export_tgz.sh svneol=native#text/plain
 tools/install/create_lazarus_rpm.sh svneol=native#text/plain
 tools/install/create_lazarus_snapshot_rpm.sh svneol=native#text/plain
-tools/install/create_lazarus_tgz_from_local_dir.sh svneol=native#text/plain
 tools/install/cross_unix/HowToCreate_fpc_crosswin32_rpm.txt svneol=native#text/plain
 tools/install/cross_unix/build_linux_cross_win32_rpm.sh svneol=native#text/plain
 tools/install/cross_unix/update_cross_fpc.sh svneol=native#text/plain
@@ -2563,7 +2562,6 @@ tools/install/debian_fpc/control svneol=native#text/plain
 tools/install/debian_fpc/copyright svneol=native#text/plain
 tools/install/debian_fpc/postinst svneol=native#text/plain
 tools/install/do_nothing.sh svneol=native#text/plain
-tools/install/download_and_build_fpc_rpm.sh svneol=native#text/plain
 tools/install/file_filter.sh svneol=native#text/plain
 tools/install/fpc-src.spec svneol=native#text/plain
 tools/install/get_lazarus_version.sh svneol=native#text/plain
diff --git a/tools/install/build_fpc_rpm.sh b/tools/install/build_fpc_rpm.sh
index a77309f6ad..059eef8825 100755
--- a/tools/install/build_fpc_rpm.sh
+++ b/tools/install/build_fpc_rpm.sh
@@ -59,9 +59,6 @@ if [ "$WithTempDir" = "yes" ]; then
   fi
   mkdir -p $TmpDir
 
-  #ppc386 -Fu../../lcl/units/i386/linux cvsexportlocal.pas
-  #echo "extracting FPC from local cvs ..."
-  #./cvsexportlocal $FPCSrcDir $TmpDir
   echo "extracting FPC from local svn ..."
   svn export $FPCSrcDir $TmpDir/fpc
 else
diff --git a/tools/install/create_clean_fpcsrc_directory.sh b/tools/install/create_clean_fpcsrc_directory.sh
index 9e2f0b624a..69622ae1d4 100755
--- a/tools/install/create_clean_fpcsrc_directory.sh
+++ b/tools/install/create_clean_fpcsrc_directory.sh
@@ -40,7 +40,7 @@ else
   cp -a $SrcDir $DestDir
 fi
 
-echo "cleaning up (CVS, ppu, o) ..."
+echo "cleaning up (svn, ppu, o) ..."
 cd $DestDir
 make distclean
 for Ext in ppu ppw ppl o ow rst cvsignore bak orig rej xvpics; do
@@ -50,6 +50,8 @@ find . -name "*.~*" -exec rm -f {} \;
 find . -name "*.#*" -exec rm -f {} \;
 # delete all CVS directories
 find . -name "CVS" -exec rm -rf {} \;
+# delete all .svn directories
+find . -name ".svn" -exec rm -rf {} \;
 # delete all executables
 find . -perm +a+x -type f -exec rm -f {} \;
 cd -
diff --git a/tools/install/create_clean_lazarus_directory.sh b/tools/install/create_clean_lazarus_directory.sh
index ecb8359309..80956ce3ff 100755
--- a/tools/install/create_clean_lazarus_directory.sh
+++ b/tools/install/create_clean_lazarus_directory.sh
@@ -40,7 +40,7 @@ else
   cp -a $LazSrcDir $LazDestDir
 fi
 
-echo "cleaning up (CVS, ppu, o) ..."
+echo "cleaning up (svn, ppu, o) ..."
 cd $LazDestDir
 make clean
 make -C examples clean
@@ -52,6 +52,8 @@ find . -name "*.~*" -exec rm -f {} \;
 find . -name "*.#*" -exec rm -f {} \;
 # delete all CVS directories
 find . -name "CVS" -exec rm -rf {} \;
+# delete all SVN directories
+find . -name ".svn" -exec rm -rf {} \;
 # delete all executables
 find . -perm +a+x -type f -exec rm -f {} \;
 rm -rf tools/install/*.tgz
diff --git a/tools/install/create_lazarus_tgz_from_local_dir.sh b/tools/install/create_lazarus_tgz_from_local_dir.sh
deleted file mode 100755
index f4d3604db0..0000000000
--- a/tools/install/create_lazarus_tgz_from_local_dir.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -e
-
-LazSrcDir=$1
-OutputFile=$2
-
-if [ "x$LazSrcDir" = "x" ]; then
-  echo "Usage: $0 <lazarus_source_directory> <output-file>"
-  exit
-fi
-if [ ! -d $LazSrcDir/designer ]; then
-  echo "The directory does not look like a lazarus source directory (lazarus/)"
-  exit
-fi
-
-if [ "x$OutputFile" = "x" ]; then
-  echo "Usage: $0 <lazarus_source_directory> <output-file>"
-  exit -1
-fi
-
-
-TmpBaseDir=/tmp
-TmpDir=$TmpBaseDir/lazarus
-
-ppc386 -Fu../../lcl/units/i386/linux cvsexportlocal.pas
-echo "extracting Lazarus from local cvs ..."
-rm -rf $TmpDir
-./cvsexportlocal $LazSrcDir $TmpDir
-
-# pack
-echo "packing ..."
-cd /tmp
-tar cvzf lazarus.tgz lazarus
-cd -
-mv /tmp/lazarus.tgz $OutputFile
-rm -rf /tmp/lazarus
-
-echo ""
-echo "NOTE: DON'T FORGET TO PUT THE $OutFile INTO /usr/src/redhat/SOURCES/"
-
-# end.
-
diff --git a/tools/install/cross_unix/update_cross_fpc.sh b/tools/install/cross_unix/update_cross_fpc.sh
index fddc2b4eac..2318175e91 100755
--- a/tools/install/cross_unix/update_cross_fpc.sh
+++ b/tools/install/cross_unix/update_cross_fpc.sh
@@ -273,7 +273,7 @@ if [ $BuildCrossFPC = "yes" ]; then
     cd $BuildRoot/install/cross/
     cat buildcrosssnaphot | \
       sed -e 's#^CROSSTOOLSROOT=.*$#CROSSTOOLSROOT='"$BuildRoot"'/binutils/cross/#' \
-          -e 's#^FPCCVS=.*$#FPCCVS='"$BuildRoot"'/fpc#' \
+          -e 's#^FPCSVN=.*$#FPCSVN='"$BuildRoot"'/fpc#' \
           -e 's#^TARGETS_OS=.*$#TARGETS_OS='"$TargetOS"'#' \
           -e 's#^TARGETS_CPU=.*$#TARGETS_CPU='"$TargetCPU"'#' \
           -e 's#^MOS=cygwin$#MOS=mingw32#' \
diff --git a/tools/install/download_and_build_fpc_rpm.sh b/tools/install/download_and_build_fpc_rpm.sh
deleted file mode 100755
index 28d4e2e337..0000000000
--- a/tools/install/download_and_build_fpc_rpm.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-#
-# Author: Mattias Gaertner
-#
-# Script to download fpc and create the rpms 'fpc' and 'fpc-src'.
-
-set -x
-set -e
-
-#------------------------------------------------------------------------------
-# parse parameters
-#------------------------------------------------------------------------------
-Usage="Usage: $0 devel|stable [nodocs]"
-
-FPCVersion=$1
-
-FPCVersionOk=no
-for ver in devel stable; do
-  if [ "x$FPCVersion" = "x$ver" ]; then
-    FPCVersionOk=yes
-  fi
-done
-if [ "x$FPCVersionOk" = "xno" ]; then
-  echo $Usage
-  exit -1
-fi
-
-shift
-
-WithDOCS=yes
-if [ "x$1" = "xnodocs" ]; then
-  WithDOCS=no
-  shift
-fi
-
-if [ "x$1" != "x" ]; then
-  echo $Usage
-  exit -1
-fi
-
-
-# set here the fpc svn dates for the various versions
-if [ "x$FPCVersion" = "xdevel" ]; then
-  Year=04
-  Month=06
-  Day=07
-  LazVersion=1.9.5
-fi
-if [ "x$FPCVersion" = "xstable" ]; then
-  Year=04
-  Month=06
-  Day=07
-  LazVersion=1.0.11
-fi
-
-Date=20$Year$Month$Day
-LazRelease=laz.$Date
-SrcTGZ=fpc-src-$LazVersion-$LazRelease.tgz
-SrcPatch=fpc-src-patch
-TmpDir=/tmp/fpc$LazVersion
-SpecFile=$TmpDir/fpc/install/fpc.spec
-
-# download fpc svn if necessary
-if [ ! -f $SrcTGZ ]; then
-  ./create_fpc_export_tgz.sh $SrcTGZ $FPCVersion $Month/$Day/$Year
-fi
-
-# unpack source into temporary directory
-rm -rf $TmpDir
-mkdir -p $TmpDir
-cp $SrcTGZ $SrcPatch $TmpDir/
-cd $TmpDir
-tar xzf $SrcTGZ
-cd -
-
-# compile
-Params="notemp $TmpDir/fpc $LazRelease"
-if [ "$WithDOCS" = "no" ]; then
-  Params="nodocs $Params"
-fi
-./build_fpc_rpm.sh $Params
-
-
-
-echo
-echo building fpc-src rpm ...
-set -x
-
-# copy src tgz into building directory
-cp $SrcTGZ /usr/src/redhat/SOURCES/
-
-# create spec file
-SpecFile=fpc-src-$LazVersion-$LazRelease.spec
-cat fpc-src.spec | \
-  sed -e "s/LAZVERSION/$LazVersion/g" -e "s/LAZRELEASE/$LazRelease/" \
-  > $SpecFile
-
-# build rpm
-rpmbuild -ba $SpecFile || rpm -ba $SpecFile
-
-# end.
-
diff --git a/tools/install/win32/create_installer.bat b/tools/install/win32/create_installer.bat
index 214167ec05..4d70631eb1 100644
--- a/tools/install/win32/create_installer.bat
+++ b/tools/install/win32/create_installer.bat
@@ -8,7 +8,7 @@ SET ISCC="C:\Program Files\Inno Setup 5\iscc.exe"
 :: Path to the fpc sources checked out of svn
 SET FPCSVNDIR=C:\lazarus\source\fpc\fpcbuild-2.0.2\fpcsrc
 
-:: Path to the lazarus sources checked out of cvs
+:: Path to the lazarus sources checked out of svn
 SET LAZSVNDIR=c:\lazarus\source\lazarus-0.9.16
 
 :: Path to fpc 2.0.2 compiler