diff --git a/Makefile b/Makefile
index 46ee615ad3..b6eb9ce92e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/09/23]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/05/08]
 #
 default: all
-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-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -282,9 +282,6 @@ endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
 endif
@@ -336,15 +333,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
 endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_DIRS+=lcl components packager/registration ideintf designer packager
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
@@ -390,9 +381,6 @@ endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_PROGRAMS+=lazarus startlazarus
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
@@ -444,15 +432,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_PROGRAMS+=lazarus startlazarus
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_PROGRAMS+=lazarus startlazarus
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_EXAMPLEDIRS+=examples
 endif
@@ -498,9 +480,6 @@ endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 override TARGET_EXAMPLEDIRS+=examples
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_EXAMPLEDIRS+=examples
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override TARGET_EXAMPLEDIRS+=examples
 endif
@@ -552,15 +531,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override TARGET_EXAMPLEDIRS+=examples
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_EXAMPLEDIRS+=examples
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override TARGET_EXAMPLEDIRS+=examples
 endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_EXAMPLEDIRS+=examples
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -606,9 +579,6 @@ endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -660,15 +630,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 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
 override INSTALL_BASEDIR=share/lazarus
 override INSTALL_FPCPACKAGE=n
 override DIST_DESTDIR=$(BASEDIR)/dist
@@ -1584,15 +1548,6 @@ REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_REGEXPR=1
-REQUIRE_PACKAGES_PASJPEG=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_LIBASYNC=1
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -1797,15 +1752,6 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_REGEXPR=1
-REQUIRE_PACKAGES_PASJPEG=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_LIBASYNC=1
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -1820,15 +1766,6 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),arm-wince)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_REGEXPR=1
-REQUIRE_PACKAGES_PASJPEG=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_LIBASYNC=1
-endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -2190,7 +2127,7 @@ else
 FPCCPUOPT:=
 endif
 endif
-override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
@@ -2801,14 +2738,6 @@ TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_DESIGNER=1
 TARGET_DIRS_PACKAGER=1
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
-TARGET_DIRS_PACKAGER/REGISTRATION=1
-TARGET_DIRS_IDEINTF=1
-TARGET_DIRS_DESIGNER=1
-TARGET_DIRS_PACKAGER=1
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 TARGET_DIRS_LCL=1
 TARGET_DIRS_COMPONENTS=1
@@ -2945,14 +2874,6 @@ TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_DESIGNER=1
 TARGET_DIRS_PACKAGER=1
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
-TARGET_DIRS_PACKAGER/REGISTRATION=1
-TARGET_DIRS_IDEINTF=1
-TARGET_DIRS_DESIGNER=1
-TARGET_DIRS_PACKAGER=1
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 TARGET_DIRS_LCL=1
 TARGET_DIRS_COMPONENTS=1
@@ -2961,14 +2882,6 @@ TARGET_DIRS_IDEINTF=1
 TARGET_DIRS_DESIGNER=1
 TARGET_DIRS_PACKAGER=1
 endif
-ifeq ($(FULL_TARGET),arm-wince)
-TARGET_DIRS_LCL=1
-TARGET_DIRS_COMPONENTS=1
-TARGET_DIRS_PACKAGER/REGISTRATION=1
-TARGET_DIRS_IDEINTF=1
-TARGET_DIRS_DESIGNER=1
-TARGET_DIRS_PACKAGER=1
-endif
 ifdef TARGET_DIRS_LCL
 lcl_all:
 	$(MAKE) -C lcl all
@@ -3284,9 +3197,6 @@ endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
@@ -3338,15 +3248,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
-ifeq ($(FULL_TARGET),arm-wince)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
 ifdef TARGET_EXAMPLEDIRS_EXAMPLES
 examples_all:
 	$(MAKE) -C examples all
@@ -3413,7 +3317,7 @@ ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .PHONY: lcl components packager/registration ideintf packager ide idepkg starter tools all clean cleanide purge examples install
-ide:
+ide: 
 	$(MAKE) -C ide ide
 idepkg:
 	$(MAKE) -C ide idepkg
diff --git a/Makefile.fpc b/Makefile.fpc
index bec0341467..67e9b4e58c 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -41,7 +41,7 @@ endif
 .PHONY: lcl components packager/registration ideintf packager ide idepkg starter tools all clean cleanide purge examples install
 
 #-----------------------------------------------------------------------------
-ide:
+ide: 
         $(MAKE) -C ide ide
 
 #-----------------------------------------------------------------------------
diff --git a/ide/Makefile b/ide/Makefile
index f35f729ad2..5f72c884be 100644
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/09/23]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/05/08]
 #
 default: all
-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-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince
+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-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -304,9 +304,6 @@ endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_PROGRAMS+=lazarus startlazarus
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
@@ -358,15 +355,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_PROGRAMS+=lazarus startlazarus
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
-ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_PROGRAMS+=lazarus startlazarus
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -412,9 +403,6 @@ endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -466,15 +454,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),arm-wince)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 override INSTALL_BASEDIR=share/lazarus/ide
 override INSTALL_FPCPACKAGE=n
 override DIST_DESTDIR=$(BASEDIR)/dist
@@ -523,9 +505,6 @@ endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 override COMPILER_OPTIONS+=-gl
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-gl
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override COMPILER_OPTIONS+=-gl
 endif
@@ -577,15 +556,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override COMPILER_OPTIONS+=-gl
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-gl
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_OPTIONS+=-gl
 endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-gl
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
 endif
@@ -631,9 +604,6 @@ endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
 endif
@@ -685,15 +655,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
 endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/units ../debugger ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
@@ -739,9 +703,6 @@ endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/units ../debugger ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/units ../debugger ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/units ../debugger ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
@@ -793,15 +754,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/units ../debugger ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/units ../debugger ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/units ../debugger ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
 endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/units ../debugger ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_TARGETDIR+=..
 endif
@@ -847,9 +802,6 @@ endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 override COMPILER_TARGETDIR+=..
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_TARGETDIR+=..
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override COMPILER_TARGETDIR+=..
 endif
@@ -901,15 +853,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override COMPILER_TARGETDIR+=..
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_TARGETDIR+=..
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_TARGETDIR+=..
 endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_TARGETDIR+=..
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -955,9 +901,6 @@ endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1009,15 +952,9 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1930,15 +1867,6 @@ REQUIRE_PACKAGES_PASJPEG=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 endif
-ifeq ($(FULL_TARGET),i386-wince)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_REGEXPR=1
-REQUIRE_PACKAGES_PASJPEG=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_LIBASYNC=1
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -2143,15 +2071,6 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),x86_64-win64)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_REGEXPR=1
-REQUIRE_PACKAGES_PASJPEG=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_LIBASYNC=1
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -2166,15 +2085,6 @@ REQUIRE_PACKAGES_POSTGRES=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_SQLITE=1
 endif
-ifeq ($(FULL_TARGET),arm-wince)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_REGEXPR=1
-REQUIRE_PACKAGES_PASJPEG=1
-REQUIRE_PACKAGES_NETDB=1
-REQUIRE_PACKAGES_LIBASYNC=1
-endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -2536,7 +2446,7 @@ else
 FPCCPUOPT:=
 endif
 endif
-override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+override FPCOPT+=-Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
 endif
 ifdef STRIP
@@ -3037,6 +2947,7 @@ endif
 %.res: %.rc
 	windres -i $< -o $@ --preprocessor $(RCPP)
 ide: $(COMPILER_UNITTARGETDIR)
+	../tools/svn2revisioninc$(EXEEXT) .. revision.inc
 ifeq ($(OS_TARGET), win32)
 	$(MAKE) lazarus.res
 endif
diff --git a/ide/Makefile.fpc b/ide/Makefile.fpc
index 554506a8c3..9924a4d82b 100644
--- a/ide/Makefile.fpc
+++ b/ide/Makefile.fpc
@@ -107,6 +107,8 @@ endif
 
 #-----------------------------------------------------------------------------
 ide: $(COMPILER_UNITTARGETDIR)
+#	$(MAKE) -C ../tools svn2revisioninc$(EXEEXT)
+	../tools/svn2revisioninc$(EXEEXT) .. revision.inc
 ifeq ($(OS_TARGET), win32)
         $(MAKE) lazarus.res
 endif
diff --git a/ide/aboutfrm.lfm b/ide/aboutfrm.lfm
index 63a79b3052..313a0430f0 100644
--- a/ide/aboutfrm.lfm
+++ b/ide/aboutfrm.lfm
@@ -1,9 +1,10 @@
 object AboutForm: TAboutForm
+  ActiveControl = AboutPage
   Caption = 'About Lazarus'
   ClientHeight = 270
   ClientWidth = 608
   OnCreate = AboutFormCreate
-  PixelsPerInch = 81
+  PixelsPerInch = 96
   Position = poScreenCenter
   HorzScrollBar.Page = 607
   VertScrollBar.Page = 269
@@ -17,9 +18,9 @@ object AboutForm: TAboutForm
     Caption = 'Version #:'
     ParentColor = True
     Left = 14
-    Height = 12
+    Height = 13
     Top = 6
-    Width = 57
+    Width = 50
   end
   object BuildDateLabel: TLabel
     Alignment = taCenter
@@ -27,21 +28,22 @@ object AboutForm: TAboutForm
     Caption = 'Date:'
     ParentColor = True
     Left = 14
-    Height = 12
+    Height = 13
     Top = 23
-    Width = 29
+    Width = 27
   end
   object RevisionLabel: TLabel
     Caption = 'RevisionLabel'
     Color = clNone
     Left = 14
-    Height = 12
+    Height = 13
     Top = 40
-    Width = 79
+    Width = 65
   end
   object CloseButton: TBitBtn
     AutoSize = True
     BorderSpacing.OnChange = nil
+    BorderSpacing.InnerBorder = 2
     Cancel = True
     Caption = 'Close'
     Glyph.Data = {
@@ -73,9 +75,9 @@ object AboutForm: TAboutForm
     ModalResult = 1
     TabOrder = 1
     Left = 70
-    Height = 30
+    Height = 40
     Top = 225
-    Width = 65
+    Width = 77
   end
   object Notebook1: TNotebook
     Anchors = [akTop, akLeft, akRight, akBottom]
@@ -87,38 +89,34 @@ object AboutForm: TAboutForm
     Width = 389
     object AboutPage: TPage
       Caption = 'About'
-      ClientWidth = 385
-      ClientHeight = 231
-      Left = 2
-      Height = 231
-      Top = 28
-      Width = 385
+      ClientWidth = 381
+      ClientHeight = 235
+      Height = 235
+      Width = 381
       object AboutMemo: TMemo
         Align = alClient
         BorderSpacing.OnChange = nil
         ReadOnly = True
         ScrollBars = ssAutoBoth
         TabOrder = 0
-        Height = 231
-        Width = 385
+        Height = 235
+        Width = 381
       end
     end
     object ContributorsPage: TPage
       Caption = 'Contributors'
-      ClientWidth = 385
-      ClientHeight = 231
-      Left = 2
-      Height = 231
-      Top = 28
-      Width = 385
+      ClientWidth = 381
+      ClientHeight = 235
+      Height = 235
+      Width = 381
       object ContributorsMemo: TMemo
         Align = alClient
         BorderSpacing.OnChange = nil
         ReadOnly = True
         ScrollBars = ssAutoBoth
         TabOrder = 0
-        Height = 231
-        Width = 385
+        Height = 235
+        Width = 381
       end
     end
   end
diff --git a/ide/aboutfrm.lrs b/ide/aboutfrm.lrs
index fff01331fe..ea76f0670e 100644
--- a/ide/aboutfrm.lrs
+++ b/ide/aboutfrm.lrs
@@ -1,42 +1,42 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TAboutForm','FORMDATA',[
-  'TPF0'#10'TAboutForm'#9'AboutForm'#7'Caption'#6#13'About Lazarus'#12'ClientHe'
-  +'ight'#3#14#1#11'ClientWidth'#3'`'#2#8'OnCreate'#7#15'AboutFormCreate'#13'Pi'
-  +'xelsPerInch'#2'Q'#8'Position'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3
-  +'_'#2#18'VertScrollBar.Page'#3#13#1#4'Left'#3'_'#1#6'Height'#3#14#1#3'Top'#3
-  +#133#1#5'Width'#3'`'#2#0#6'TLabel'#12'VersionLabel'#9'Alignment'#7#8'taCente'
-  +'r'#22'BorderSpacing.OnChange'#13#7'Caption'#6#10'Version #:'#11'ParentColor'
-  +#9#4'Left'#2#14#6'Height'#2#12#3'Top'#2#6#5'Width'#2'9'#0#0#6'TLabel'#14'Bui'
-  +'ldDateLabel'#9'Alignment'#7#8'taCenter'#22'BorderSpacing.OnChange'#13#7'Cap'
-  +'tion'#6#5'Date:'#11'ParentColor'#9#4'Left'#2#14#6'Height'#2#12#3'Top'#2#23#5
-  +'Width'#2#29#0#0#6'TLabel'#13'RevisionLabel'#7'Caption'#6#13'RevisionLabel'#5
-  +'Color'#7#6'clNone'#4'Left'#2#14#6'Height'#2#12#3'Top'#2'('#5'Width'#2'O'#0#0
-  +#7'TBitBtn'#11'CloseButton'#8'AutoSize'#9#22'BorderSpacing.OnChange'#13#6'Ca'
-  +'ncel'#9#7'Caption'#6#5'Close'#10'Glyph.Data'#10#251#2#0#0#247#2#0#0'/* XPM '
-  +'*/'#10'static char * botaoFechar_xpm[] = {'#10'"24 24 2 1",'#10'" '#9'c Non'
-  +'e",'#10'".'#9'c #000000",'#10'"                        ",'#10'"            '
-  +'            ",'#10'"                        ",'#10'"                       '
-  +' ",'#10'"                        ",'#10'"                        ",'#10'"  '
-  +'     .      .         ",'#10'"        .    ...        ",'#10'"        ..  .'
-  +'...        ",'#10'"         .. ...         ",'#10'"         .....          '
-  +'",'#10'"          ...           ",'#10'"         .....          ",'#10'"   '
-  +'     .......         ",'#10'"       ...  ....        ",'#10'"      ...    .'
-  +'...       ",'#10'"     ...      ..        ",'#10'"                        "'
-  +','#10'"                        ",'#10'"                        ",'#10'"    '
-  +'                    ",'#10'"                        ",'#10'"               '
-  +'         ",'#10'"                        "};'#10#11'ModalResult'#2#1#8'TabO'
-  +'rder'#2#1#4'Left'#2'F'#6'Height'#2#30#3'Top'#3#225#0#5'Width'#2'A'#0#0#9'TN'
-  +'otebook'#9'Notebook1'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBotto'
-  +'m'#0#22'BorderSpacing.OnChange'#13#9'PageIndex'#2#0#4'Left'#3#215#0#6'Heigh'
-  +'t'#3#5#1#3'Top'#2#6#5'Width'#3#133#1#0#5'TPage'#9'AboutPage'#7'Caption'#6#5
-  +'About'#11'ClientWidth'#3#129#1#12'ClientHeight'#3#231#0#4'Left'#2#2#6'Heigh'
-  +'t'#3#231#0#3'Top'#2#28#5'Width'#3#129#1#0#5'TMemo'#9'AboutMemo'#5'Align'#7#8
-  +'alClient'#22'BorderSpacing.OnChange'#13#8'ReadOnly'#9#10'ScrollBars'#7#10's'
-  +'sAutoBoth'#8'TabOrder'#2#0#6'Height'#3#231#0#5'Width'#3#129#1#0#0#0#5'TPage'
-  +#16'ContributorsPage'#7'Caption'#6#12'Contributors'#11'ClientWidth'#3#129#1
-  +#12'ClientHeight'#3#231#0#4'Left'#2#2#6'Height'#3#231#0#3'Top'#2#28#5'Width'
-  +#3#129#1#0#5'TMemo'#16'ContributorsMemo'#5'Align'#7#8'alClient'#22'BorderSpa'
-  +'cing.OnChange'#13#8'ReadOnly'#9#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'
-  +#2#0#6'Height'#3#231#0#5'Width'#3#129#1#0#0#0#0#0
+  'TPF0'#10'TAboutForm'#9'AboutForm'#13'ActiveControl'#7#9'AboutPage'#7'Caption'
+  +#6#13'About Lazarus'#12'ClientHeight'#3#14#1#11'ClientWidth'#3'`'#2#8'OnCrea'
+  +'te'#7#15'AboutFormCreate'#13'PixelsPerInch'#2'`'#8'Position'#7#14'poScreenC'
+  +'enter'#18'HorzScrollBar.Page'#3'_'#2#18'VertScrollBar.Page'#3#13#1#4'Left'#3
+  +'_'#1#6'Height'#3#14#1#3'Top'#3#133#1#5'Width'#3'`'#2#0#6'TLabel'#12'Version'
+  +'Label'#9'Alignment'#7#8'taCenter'#22'BorderSpacing.OnChange'#13#7'Caption'#6
+  +#10'Version #:'#11'ParentColor'#9#4'Left'#2#14#6'Height'#2#13#3'Top'#2#6#5'W'
+  +'idth'#2'2'#0#0#6'TLabel'#14'BuildDateLabel'#9'Alignment'#7#8'taCenter'#22'B'
+  +'orderSpacing.OnChange'#13#7'Caption'#6#5'Date:'#11'ParentColor'#9#4'Left'#2
+  +#14#6'Height'#2#13#3'Top'#2#23#5'Width'#2#27#0#0#6'TLabel'#13'RevisionLabel'
+  +#7'Caption'#6#13'RevisionLabel'#5'Color'#7#6'clNone'#4'Left'#2#14#6'Height'#2
+  +#13#3'Top'#2'('#5'Width'#2'A'#0#0#7'TBitBtn'#11'CloseButton'#8'AutoSize'#9#22
+  +'BorderSpacing.OnChange'#13#25'BorderSpacing.InnerBorder'#2#2#6'Cancel'#9#7
+  +'Caption'#6#5'Close'#10'Glyph.Data'#10#251#2#0#0#247#2#0#0'/* XPM */'#10'sta'
+  +'tic char * botaoFechar_xpm[] = {'#10'"24 24 2 1",'#10'" '#9'c None",'#10'".'
+  +#9'c #000000",'#10'"                        ",'#10'"                        '
+  +'",'#10'"                        ",'#10'"                        ",'#10'"   '
+  +'                     ",'#10'"                        ",'#10'"       .      '
+  +'.         ",'#10'"        .    ...        ",'#10'"        ..  ....        "'
+  +','#10'"         .. ...         ",'#10'"         .....          ",'#10'"    '
+  +'      ...           ",'#10'"         .....          ",'#10'"        .......'
+  +'         ",'#10'"       ...  ....        ",'#10'"      ...    ....       ",'
+  +#10'"     ...      ..        ",'#10'"                        ",'#10'"       '
+  +'                 ",'#10'"                        ",'#10'"                  '
+  +'      ",'#10'"                        ",'#10'"                        ",'#10
+  +'"                        "};'#10#11'ModalResult'#2#1#8'TabOrder'#2#1#4'Left'
+  +#2'F'#6'Height'#2'('#3'Top'#3#225#0#5'Width'#2'M'#0#0#9'TNotebook'#9'Noteboo'
+  +'k1'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#22'BorderSpac'
+  +'ing.OnChange'#13#9'PageIndex'#2#0#4'Left'#3#215#0#6'Height'#3#5#1#3'Top'#2#6
+  +#5'Width'#3#133#1#0#5'TPage'#9'AboutPage'#7'Caption'#6#5'About'#11'ClientWid'
+  +'th'#3'}'#1#12'ClientHeight'#3#235#0#6'Height'#3#235#0#5'Width'#3'}'#1#0#5'T'
+  +'Memo'#9'AboutMemo'#5'Align'#7#8'alClient'#22'BorderSpacing.OnChange'#13#8'R'
+  +'eadOnly'#9#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#6'Height'#3#235#0
+  +#5'Width'#3'}'#1#0#0#0#5'TPage'#16'ContributorsPage'#7'Caption'#6#12'Contrib'
+  +'utors'#11'ClientWidth'#3'}'#1#12'ClientHeight'#3#235#0#6'Height'#3#235#0#5
+  +'Width'#3'}'#1#0#5'TMemo'#16'ContributorsMemo'#5'Align'#7#8'alClient'#22'Bor'
+  +'derSpacing.OnChange'#13#8'ReadOnly'#9#10'ScrollBars'#7#10'ssAutoBoth'#8'Tab'
+  +'Order'#2#0#6'Height'#3#235#0#5'Width'#3'}'#1#0#0#0#0#0
 ]);
diff --git a/ide/aboutfrm.pas b/ide/aboutfrm.pas
index 5d4b678bfb..5d8fec116b 100644
--- a/ide/aboutfrm.pas
+++ b/ide/aboutfrm.pas
@@ -60,9 +60,8 @@ const
   LazarusVersionStr= '0.9.11';
 var
   LazarusRevisionStr: string;
-
+  
 function GetLazarusVersionString : string;
-function GetLazarusRevision: string;
 
 implementation
 
@@ -81,23 +80,6 @@ begin
   Result:=format(lisLazarusVersionString,[LazarusVersionStr]);
 end;
 
-function GetLazarusRevision: string;
-var
-  p: Integer;
-  l: Integer;
-begin
-  // use first number as revision
-  p:=1;
-  while (p<=length(LazarusRevisionStr))
-  and (not (LazarusRevisionStr[p] in ['0'..'9'])) do
-    inc(p);
-  l:=1;
-  while (p+l<=length(LazarusRevisionStr))
-  and (LazarusRevisionStr[p+l] in ['0'..'9']) do
-    inc(l);
-  Result:=copy(LazarusRevisionStr,p,l);
-end;
-
 { TAboutForm }
 
 constructor TAboutForm.Create(TheOwner: TComponent);
@@ -138,11 +120,8 @@ begin
   FPixmap := TPixmap.Create;
   FPixmap.LoadFromLazarusResource('lazarus_about_logo');
   Caption:=lisAboutLazarus;
-  VersionLabel.Caption := lisVersion+' #: '+
-     format(lisLazarusVersionString,[LazarusVersionStr]);
-  RevisionLabel.Caption := lisSVNRevision+GetLazarusRevision;
-
-  RevisionLabel.Visible:=false; // deactivated
+  VersionLabel.Caption := lisVersion+' #: '+ GetLazarusVersionString;
+  RevisionLabel.Caption := lisSVNRevision+LazarusRevisionStr;
 
   BuildDateLabel.Caption := lisDate+': '+GetLocalizedBuildDate;
   AboutPage.Caption:=lisMenuTemplateAbout;
diff --git a/ide/lazarus.pp b/ide/lazarus.pp
index 83e7ea5f08..ab29cad331 100644
--- a/ide/lazarus.pp
+++ b/ide/lazarus.pp
@@ -58,7 +58,7 @@ uses
   {$ENDIF}
   MainBase;
 
-const RevisionStr='0'; {$I revision.inc}
+{$I revision.inc}
 
 begin
   LazarusRevisionStr:=RevisionStr;
diff --git a/lcl/include/control.inc b/lcl/include/control.inc
index c024efcd71..3558de10c1 100644
--- a/lcl/include/control.inc
+++ b/lcl/include/control.inc
@@ -1962,7 +1962,7 @@ begin
           // if there is a parent, ask it
           or ((Parent<>nil) and Parent.AutoSizeDelayed);
   {$IFDEF VerboseCanAutoSize}
-  if Result and AutoSize then begin
+  if Result {and AutoSize} then begin
     DbgOut('TControl.AutoSizeDelayed Self='+DbgSName(Self)+' ');
     if FAutoSizingLockCount>0 then debugln('FAutoSizingLockCount=',dbgs(FAutoSizingLockCount))
     else if csLoading in ComponentState then debugln('csLoading')
diff --git a/lcl/interfaces/gtk/gtkproc.inc b/lcl/interfaces/gtk/gtkproc.inc
index 4bb9ece910..2a64edbc27 100644
--- a/lcl/interfaces/gtk/gtkproc.inc
+++ b/lcl/interfaces/gtk/gtkproc.inc
@@ -6510,7 +6510,7 @@ begin
   gtk_widget_show(ScrolledWidget);
   ClientAreaWidget := gtk_layout_new(nil, nil);
   WindowStyle:=GetStyle(lgsWindow);
-  gtk_widget_set_style(ClientAreaWidget,WindowStyle);
+  //gtk_widget_set_style(ClientAreaWidget,WindowStyle);
   //debugln('CreateFormContents Style=',GetStyleDebugReport(WindowStyle));
   gtk_container_add(PGtkContainer(ScrolledWidget), ClientAreaWidget);