diff --git a/compiler/Makefile b/compiler/Makefile
index a431e4fa6a..09cf831581 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/04/23]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware
+MAKEFILETARGETS=win32
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
@@ -259,6 +259,15 @@ endif
 endif
 MSGFILE=msg/error$(FPCLANG).msg
 override LOCALDEF+=-d$(PPC_TARGET) -dGDB -dBROWSERLOG
+PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc.exe,$(SEARCHPATH))))
+ifeq ($(PASDOC),)
+PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc,$(SEARCHPATH))))
+endif
+ifeq ($(PASDOC),)
+PASDOC:=../projects/pasdoc/bin/pasdoc
+else
+PASDOC:=$(firstword $(PASDOC))
+endif
 ifeq ($(PPC_TARGET),i386)
 override LOCALDEF+=-dSUPPORT_MMX
 endif
@@ -571,6 +580,18 @@ EXEEXT=
 FPCMADE=fpcmade.qnx
 ZIPSUFFIX=qnx
 endif
+ifeq ($(OS_TARGET),netware)
+STATICLIBPREFIX=
+PPUEXT=.ppn
+OEXT=.on
+ASMEXT=.s
+SMARTEXT=.sl
+STATICLIBEXT=.a
+SHAREDLIBEXT=.nlm
+FPCMADE=fpcmade.nw
+ZIPSUFFIX=nw
+EXEEXT=.nlm
+endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -793,42 +814,9 @@ TAROPT=vz
 TAREXT=.tar.gz
 endif
 override REQUIRE_PACKAGES=rtl
-ifeq ($(OS_TARGET),linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(OS_TARGET),go32v2)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(OS_TARGET),win32)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(OS_TARGET),os2)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(OS_TARGET),freebsd)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(OS_TARGET),beos)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(OS_TARGET),netbsd)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(OS_TARGET),amiga)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(OS_TARGET),atari)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(OS_TARGET),sunos)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(OS_TARGET),qnx)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(OS_TARGET),netware)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -1503,6 +1491,8 @@ cycledep:
 	$(MAKE) cycle USEDEPEND=1
 cvstest:
 	$(MAKE) cycle 'LOCALOPT=-n -Se' 'RTLOPTS=-n -Se'
+htmldocs:
+	$(PASDOC) -p -h -o html$(PATHSEP)$(PPC_TARGET) -d fpc -d gdb -d $(PPC_TARGET) -u $(PPC_TARGET) $(PPC_TARGET)$(LOCALPATHSEP)*.pas targets$(LOCALPATHSEP)*.pas *.pas
 .PHONY: quickinstall install installsym
 MSGINSTALLDIR=$(INSTALL_BASEDIR)/msg
 override PPEXEFILE:=$(wildcard $(EXENAME))
diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc
index ce482fe784..b8462d9450 100644
--- a/compiler/Makefile.fpc
+++ b/compiler/Makefile.fpc
@@ -123,6 +123,16 @@ MSGFILE=msg/error$(FPCLANG).msg
 # set correct defines (-d$(CPU_TARGET) is automaticly added in makefile.fpc)
 override LOCALDEF+=-d$(PPC_TARGET) -dGDB -dBROWSERLOG
 
+PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc.exe,$(SEARCHPATH))))
+ifeq ($(PASDOC),)
+PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc,$(SEARCHPATH))))
+endif
+ifeq ($(PASDOC),)
+PASDOC:=../projects/pasdoc/bin/pasdoc
+else
+PASDOC:=$(firstword $(PASDOC))
+endif
+
 # i386 specific
 ifeq ($(PPC_TARGET),i386)
 override LOCALDEF+=-dSUPPORT_MMX
@@ -422,6 +432,12 @@ cvstest:
         $(MAKE) cycle 'LOCALOPT=-n -Se' 'RTLOPTS=-n -Se'
 
 
+#####################################################################
+# Docs
+#####################################################################
+htmldocs:
+        $(PASDOC) -p -h -o html$(PATHSEP)$(PPC_TARGET) -d fpc -d gdb -d $(PPC_TARGET) -u $(PPC_TARGET) $(PPC_TARGET)$(PATHSEP)*.pas targets$(PATHSEP)*.pas *.pas
+
 #####################################################################
 # Installation
 #####################################################################
diff --git a/compiler/html/i386/readme.txt b/compiler/html/i386/readme.txt
new file mode 100644
index 0000000000..b1f0f0ba45
--- /dev/null
+++ b/compiler/html/i386/readme.txt
@@ -0,0 +1,5 @@
+This directory contains the documentation of the compiler with i386 as target.
+To get the documentation you've to run the pasdoc utility. You can get it from
+http://pasdoc.sourceforge.net. Do a make htmldocs in the compiler directory
+to create the documentation. The generated all*.html file provide access
+to the different documentation.
diff --git a/compiler/html/powerpc/readme.txt b/compiler/html/powerpc/readme.txt
new file mode 100644
index 0000000000..7a534cd114
--- /dev/null
+++ b/compiler/html/powerpc/readme.txt
@@ -0,0 +1,5 @@
+This directory contains the documentation of the compiler with powerpc as target.
+To get the documentation you've to run the pasdoc utility. You can get it from
+http://pasdoc.sourceforge.net. Do a make htmldocs in the compiler directory
+to create the documentation. The generated all*.html file provide access
+to the different documentation.