diff --git a/Makefile b/Makefile
index 5ce4f32034..bf7769426d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/09/06]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/20]
 #
 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-darwin 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-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
@@ -233,6 +233,7 @@ override PACKAGE_NAME=lazarus
 override PACKAGE_VERSION=0.9b
 RCPP?=$(strip $(firstword cpp$(SRCEXEEXT)))
 LAZARUS_INSTALL_DIR=/usr/share/lazarus
+LAZARUS_MAN_DIR=/usr/share/man
 ifneq ($(findstring $(OS_TARGET),win32 win64),)
 LAZARUS_INSTALL_DIR=C:\lazarus
 endif
@@ -2473,7 +2474,7 @@ ifeq ($(CPU_TARGET),powerpc)
 FPCCPUOPT:=-O1r
 endif
 else
-FPCCPUOPT:=-O2
+FPCCPUOPT:=-O1r
 endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
@@ -3811,7 +3812,7 @@ tools: lcl components
 	$(MAKE) -C tools
 examples: lcl components
 	$(MAKE) -C examples
-all: lcl components packager/registration ideintf designer packager ide starter
+all: lcl components packager/registration ideintf designer packager ide starter lazbuilder
 cleanide:
 	$(MAKE) -C ide cleanide
 cleanlaz: cleanide
@@ -3831,4 +3832,8 @@ install:
 ifeq ($(OS_TARGET),win32)
 else
 	ln -sf $(LAZARUS_INSTALL_DIR)/lazarus /usr/bin/lazarus
+	ln -sf $(LAZARUS_INSTALL_DIR)/startlazarus /usr/bin/startlazarus
+	ln -sf $(LAZARUS_INSTALL_DIR)/lazbuild /usr/bin/lazbuild
+	mkdir -p $(LAZARUS_MAN_DIR)
+	cat $(LAZARUS_INSTALL_DIR)/docs/lazbuild.1 | gzip > $(LAZARUS_MAN_DIR)/man1/lazbuild.1.gz
 endif
diff --git a/Makefile.fpc b/Makefile.fpc
index 658be06f8d..165297a917 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -30,6 +30,7 @@ destdir=$(BASEDIR)/dist
 RCPP?=$(strip $(firstword cpp$(SRCEXEEXT)))
 #
 LAZARUS_INSTALL_DIR=/usr/share/lazarus
+LAZARUS_MAN_DIR=/usr/share/man
 ifneq ($(findstring $(OS_TARGET),win32 win64),)
 LAZARUS_INSTALL_DIR=C:\lazarus
 endif
@@ -77,7 +78,7 @@ examples: lcl components
         $(MAKE) -C examples
 
 #-----------------------------------------------------------------------------
-all: lcl components packager/registration ideintf designer packager ide starter
+all: lcl components packager/registration ideintf designer packager ide starter lazbuilder
 
 #-----------------------------------------------------------------------------
 cleanide:
@@ -107,6 +108,10 @@ ifeq ($(OS_TARGET),win32)
 
 else
         ln -sf $(LAZARUS_INSTALL_DIR)/lazarus /usr/bin/lazarus
+        ln -sf $(LAZARUS_INSTALL_DIR)/startlazarus /usr/bin/startlazarus
+        ln -sf $(LAZARUS_INSTALL_DIR)/lazbuild /usr/bin/lazbuild
+        mkdir -p $(LAZARUS_MAN_DIR)
+        cat $(LAZARUS_INSTALL_DIR)/docs/lazbuild.1 | gzip > $(LAZARUS_MAN_DIR)/man1/lazbuild.1.gz
 endif
 
 
diff --git a/ide/lazarusmanager.pas b/ide/lazarusmanager.pas
index f119919add..0a34dc5731 100644
--- a/ide/lazarusmanager.pas
+++ b/ide/lazarusmanager.pas
@@ -101,6 +101,9 @@ type
   end;
   
 type
+
+  { TLazarusManager }
+
   TLazarusManager = class(TComponent)
   private
     FLazarusProcess: TLazarusProcess;