diff --git a/Makefile b/Makefile
index 82eae42806..3d26575fb1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/01/24]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/04/24]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -170,17 +170,6 @@ OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
 endif
 FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
 FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
-ifeq ($(CPU_TARGET),armeb)
-ARCH=arm
-override FPCOPT+=-Cb
-else
-ifeq ($(CPU_TARGET),armel)
-ARCH=arm
-override FPCOPT+=-CaEABI
-else
-ARCH=$(CPU_TARGET)
-endif
-endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 TARGETSUFFIX=$(OS_TARGET)
 SOURCESUFFIX=$(OS_SOURCE)
@@ -202,7 +191,7 @@ endif
 ifeq ($(OS_TARGET),linux)
 linuxHier=1
 endif
-export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+export OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
 ifdef FPCDIR
 override FPCDIR:=$(subst \,/,$(FPCDIR))
 ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
@@ -295,9 +284,6 @@ endif
 ifeq ($(FULL_TARGET),i386-beos)
 override TARGET_DIRS+=lcl packager/registration ideintf packager components
 endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_DIRS+=lcl packager/registration ideintf packager components
-endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_DIRS+=lcl packager/registration ideintf packager components
 endif
@@ -415,9 +401,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_DIRS+=lcl packager/registration ideintf packager components
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_DIRS+=lcl packager/registration ideintf packager components
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_DIRS+=lcl packager/registration ideintf packager components
 endif
@@ -442,15 +425,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override TARGET_DIRS+=lcl packager/registration ideintf packager components
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_DIRS+=lcl packager/registration ideintf packager components
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_DIRS+=lcl packager/registration ideintf packager components
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_DIRS+=lcl packager/registration ideintf packager components
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
@@ -469,9 +443,6 @@ endif
 ifeq ($(FULL_TARGET),i386-beos)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_PROGRAMS+=lazarus startlazarus
-endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
@@ -589,9 +560,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_PROGRAMS+=lazarus startlazarus
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
@@ -616,15 +584,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_PROGRAMS+=lazarus startlazarus
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_PROGRAMS+=lazarus startlazarus
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_PROGRAMS+=lazarus startlazarus
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_EXAMPLEDIRS+=examples
 endif
@@ -643,9 +602,6 @@ endif
 ifeq ($(FULL_TARGET),i386-beos)
 override TARGET_EXAMPLEDIRS+=examples
 endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_EXAMPLEDIRS+=examples
-endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_EXAMPLEDIRS+=examples
 endif
@@ -763,9 +719,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_EXAMPLEDIRS+=examples
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_EXAMPLEDIRS+=examples
 endif
@@ -790,15 +743,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override TARGET_EXAMPLEDIRS+=examples
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_EXAMPLEDIRS+=examples
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_EXAMPLEDIRS+=examples
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -817,9 +761,6 @@ endif
 ifeq ($(FULL_TARGET),i386-beos)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),i386-haiku)
-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -937,9 +878,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -964,15 +902,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 override INSTALL_BASEDIR=share/lazarus
 override INSTALL_FPCPACKAGE=n
 override DIST_DESTDIR=$(BASEDIR)/dist
@@ -1265,11 +1194,6 @@ BATCHEXT=.sh
 EXEEXT=
 SHORTSUFFIX=be
 endif
-ifeq ($(OS_TARGET),haiku)
-BATCHEXT=.sh
-EXEEXT=
-SHORTSUFFIX=hai
-endif
 ifeq ($(OS_TARGET),solaris)
 BATCHEXT=.sh
 EXEEXT=
@@ -1753,10 +1677,6 @@ ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_REGEXPR=1
 endif
-ifeq ($(FULL_TARGET),i386-haiku)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_REGEXPR=1
-endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_REGEXPR=1
@@ -1913,10 +1833,6 @@ ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_REGEXPR=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_REGEXPR=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_REGEXPR=1
@@ -1949,18 +1865,6 @@ ifeq ($(FULL_TARGET),powerpc64-embedded)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_REGEXPR=1
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_REGEXPR=1
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_REGEXPR=1
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_REGEXPR=1
-endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -2014,13 +1918,13 @@ override COMPILER_UNITDIR+=$(UNITDIR_REGEXPR)
 endif
 endif
 ifndef NOCPUDEF
-override FPCOPTDEF=$(ARCH)
+override FPCOPTDEF=$(CPU_TARGET)
 endif
 ifneq ($(OS_TARGET),$(OS_SOURCE))
 override FPCOPT+=-T$(OS_TARGET)
 endif
 ifneq ($(CPU_TARGET),$(CPU_SOURCE))
-override FPCOPT+=-P$(ARCH)
+override FPCOPT+=-P$(CPU_TARGET)
 endif
 ifeq ($(OS_SOURCE),openbsd)
 override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
@@ -2650,13 +2554,6 @@ TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
 TARGET_DIRS_COMPONENTS=1
 endif
-ifeq ($(FULL_TARGET),i386-haiku)
-TARGET_DIRS_LCL=1
-TARGET_DIRS_PACKAGER/REGISTRATION=1
-TARGET_DIRS_IDEINTF=1
-TARGET_DIRS_PACKAGER=1
-TARGET_DIRS_COMPONENTS=1
-endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_DIRS_LCL=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
@@ -2930,13 +2827,6 @@ TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
 TARGET_DIRS_COMPONENTS=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-TARGET_DIRS_LCL=1
-TARGET_DIRS_PACKAGER/REGISTRATION=1
-TARGET_DIRS_IDEINTF=1
-TARGET_DIRS_PACKAGER=1
-TARGET_DIRS_COMPONENTS=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 TARGET_DIRS_LCL=1
 TARGET_DIRS_PACKAGER/REGISTRATION=1
@@ -2993,27 +2883,6 @@ TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_PACKAGER=1
 TARGET_DIRS_COMPONENTS=1
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
-TARGET_DIRS_LCL=1
-TARGET_DIRS_PACKAGER/REGISTRATION=1
-TARGET_DIRS_IDEINTF=1
-TARGET_DIRS_PACKAGER=1
-TARGET_DIRS_COMPONENTS=1
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-TARGET_DIRS_LCL=1
-TARGET_DIRS_PACKAGER/REGISTRATION=1
-TARGET_DIRS_IDEINTF=1
-TARGET_DIRS_PACKAGER=1
-TARGET_DIRS_COMPONENTS=1
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-TARGET_DIRS_LCL=1
-TARGET_DIRS_PACKAGER/REGISTRATION=1
-TARGET_DIRS_IDEINTF=1
-TARGET_DIRS_PACKAGER=1
-TARGET_DIRS_COMPONENTS=1
-endif
 ifdef TARGET_DIRS_LCL
 lcl_all:
 	$(MAKE) -C lcl all
@@ -3257,9 +3126,6 @@ endif
 ifeq ($(FULL_TARGET),i386-beos)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
-ifeq ($(FULL_TARGET),i386-haiku)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
@@ -3377,9 +3243,6 @@ endif
 ifeq ($(FULL_TARGET),arm-palmos)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
-ifeq ($(FULL_TARGET),arm-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
 ifeq ($(FULL_TARGET),arm-wince)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
@@ -3404,15 +3267,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-linux)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
-ifeq ($(FULL_TARGET),armeb-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
 ifdef TARGET_EXAMPLEDIRS_EXAMPLES
 examples_all:
 	$(MAKE) -C examples all
@@ -3554,11 +3408,11 @@ endif
 ifneq ($(wildcard ${DEBDIR}/changelog),)
 .PHONY: debcopy deb
 DEBPACKAGEVERSION:=$(shell head -n 1 ${DEBDIR}/changelog | awk '{ print $$2 }' | tr -d '[()]')
-DEBFPCVERSION:=$(shell echo $(DEBPACKAGEVERSION) | awk -F '-' '{ print $$1 }')
-DEBSRCDIR:=$(BUILDDIR)/lazarus-$(DEBFPCVERSION)
+DEBVERSION:=$(shell echo $(DEBPACKAGEVERSION) | awk -F '-' '{ print $$1 }')
+DEBSRCDIR:=$(BUILDDIR)/lazarus-$(DEBVERSION)
 debcheck:
-ifneq ($(DEBFPCVERSION),$(PACKAGE_VERSION))
-	@$(ECHO) "Debian version ($(DEBFPCVERSION)) is not correct, expect $(PACKAGE_VERSION)"
+ifneq ($(DEBVERSION),$(PACKAGE_VERSION))
+	@$(ECHO) "Debian version ($(DEBVERSION)) is not correct, expect $(PACKAGE_VERSION)"
 	@exit 1
 endif
 debcopy: distclean
@@ -3597,7 +3451,11 @@ ifdef NODOCS
 else
 	cd $(DEBSRCDIR) ; dpkg-buildpackage -us -uc
 endif
-	mv -v -t . $(DEBSRCDIR)/../*.{deb,dsc,changes,tar.gz}
+	mv -v -t . \
+	$(DEBSRCDIR)/../*.changes \
+	$(DEBSRCDIR)/../*.deb \
+	$(DEBSRCDIR)/../*.dsc \
+	$(DEBSRCDIR)/../*.tar.gz
 debclean:
 	rm -rf $(DEBSRCDIR)
 	rmdir $(BUILDDIR)
diff --git a/Makefile.fpc b/Makefile.fpc
index d01ffbef8d..601c143a01 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -173,12 +173,12 @@ ifneq ($(wildcard ${DEBDIR}/changelog),)
 .PHONY: debcopy deb
 
 DEBPACKAGEVERSION:=$(shell head -n 1 ${DEBDIR}/changelog | awk '{ print $$2 }' | tr -d '[()]')
-DEBFPCVERSION:=$(shell echo $(DEBPACKAGEVERSION) | awk -F '-' '{ print $$1 }')
-DEBSRCDIR:=$(BUILDDIR)/lazarus-$(DEBFPCVERSION)
+DEBVERSION:=$(shell echo $(DEBPACKAGEVERSION) | awk -F '-' '{ print $$1 }')
+DEBSRCDIR:=$(BUILDDIR)/lazarus-$(DEBVERSION)
 
 debcheck:
-ifneq ($(DEBFPCVERSION),$(PACKAGE_VERSION))
-	@$(ECHO) "Debian version ($(DEBFPCVERSION)) is not correct, expect $(PACKAGE_VERSION)"
+ifneq ($(DEBVERSION),$(PACKAGE_VERSION))
+	@$(ECHO) "Debian version ($(DEBVERSION)) is not correct, expect $(PACKAGE_VERSION)"
 	@exit 1
 endif
 
@@ -220,7 +220,11 @@ ifdef NODOCS
 else
 	cd $(DEBSRCDIR) ; dpkg-buildpackage -us -uc
 endif
-	mv -v -t . $(DEBSRCDIR)/../*.{deb,dsc,changes,tar.gz}
+	mv -v -t . \
+	$(DEBSRCDIR)/../*.changes \
+	$(DEBSRCDIR)/../*.deb \
+	$(DEBSRCDIR)/../*.dsc \
+	$(DEBSRCDIR)/../*.tar.gz
 
 debclean:
 	rm -rf $(DEBSRCDIR)
@@ -231,4 +235,3 @@ deb: debcheck debcopy debbuild debclean
 endif   # changelog found
 
 endif
-