diff --git a/.gitattributes b/.gitattributes
index a4d900e981..0c4c4ebfb8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5565,6 +5565,7 @@ packages/paszlib/Makefile.fpc svneol=native#text/plain
 packages/paszlib/examples/Makefile svneol=native#text/plain
 packages/paszlib/examples/Makefile.fpc svneol=native#text/plain
 packages/paszlib/examples/example.pas svneol=native#text/plain
+packages/paszlib/examples/example2.pas svneol=native#text/plain
 packages/paszlib/examples/extractodt.pas svneol=native#text/plain
 packages/paszlib/examples/minigzip.pas svneol=native#text/plain
 packages/paszlib/examples/miniunz.pas svneol=native#text/plain
diff --git a/packages/paszlib/examples/Makefile b/packages/paszlib/examples/Makefile
index 8afb6408a6..561231faca 100644
--- a/packages/paszlib/examples/Makefile
+++ b/packages/paszlib/examples/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/11]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/02/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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris 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 mipsel-linux
+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 i386-nativent i386-iphonesim 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-solaris 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 mipsel-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx haiku
 LIMIT83fs = go32v2 os2 emx watcom
@@ -188,11 +188,7 @@ ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 TARGETSUFFIX=$(OS_TARGET)
 SOURCESUFFIX=$(OS_SOURCE)
 else
-ifneq ($(findstring $(OS_TARGET),$(LIMIT83fs)),)
-TARGETSUFFIX=$(OS_TARGET)
-else
 TARGETSUFFIX=$(FULL_TARGET)
-endif
 SOURCESUFFIX=$(FULL_SOURCE)
 endif
 ifneq ($(FULL_TARGET),$(FULL_SOURCE))
@@ -268,218 +264,191 @@ ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
-ifndef FPCFPMAKE
-ifdef CROSSCOMPILE
-ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
-FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
-ifneq ($(FPCPROG),)
-FPCPROG:=$(firstword $(FPCPROG))
-FPCFPMAKE:=$(shell $(FPCPROG) -PB)
-ifeq ($(strip $(wildcard $(FPCFPMAKE))),)
-FPCFPMAKE:=$(firstword $(FPCPROG))
-endif
-else
-override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-endif
-else
-FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
-FPMAKE_SKIP_CONFIG=-n
-export FPCFPMAKE
-export FPMAKE_SKIP_CONFIG
-endif
-else
-FPMAKE_SKIP_CONFIG=-n
-FPCFPMAKE=$(FPC)
-endif
-endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
-endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_PROGRAMS+=minigzip example minizip miniunz
+override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
 endif
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR
@@ -828,11 +797,6 @@ ifeq ($(OS_TARGET),NativeNT)
 SHAREDLIBEXT=.dll
 SHORTSUFFIX=nativent
 endif
-ifeq ($(OS_TARGET),wii)
-EXEEXT=.dol
-SHAREDLIBEXT=.so
-SHORTSUFFIX=wii
-endif
 else
 ifeq ($(OS_TARGET),go32v1)
 PPUEXT=.pp1
@@ -1443,11 +1407,6 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
 endif
-ifeq ($(FULL_TARGET),powerpc-wii)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_HASH=1
-REQUIRE_PACKAGES_PASZLIB=1
-endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
@@ -1581,15 +1540,6 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
-ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units/$(SOURCESUFFIX)
-else
-ifneq ($(wildcard $(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)/units_bs/$(SOURCESUFFIX)
-else
-UNITDIR_FPMAKE_RTL=$(PACKAGEDIR_RTL)
-endif
-endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(OS_TARGET)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL)/$(OS_TARGET) $(FPCMADE)
@@ -1607,9 +1557,6 @@ endif
 ifdef UNITDIR_RTL
 override COMPILER_UNITDIR+=$(UNITDIR_RTL)
 endif
-ifdef UNITDIR_FPMAKE_RTL
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL)
-endif
 endif
 ifdef REQUIRE_PACKAGES_HASH
 PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1619,15 +1566,6 @@ UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)
 else
 UNITDIR_HASH=$(PACKAGEDIR_HASH)
 endif
-ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)
-else
-ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)
-else
-UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)
-endif
-endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_HASH)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE)
@@ -1645,9 +1583,6 @@ endif
 ifdef UNITDIR_HASH
 override COMPILER_UNITDIR+=$(UNITDIR_HASH)
 endif
-ifdef UNITDIR_FPMAKE_HASH
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH)
-endif
 endif
 ifdef REQUIRE_PACKAGES_PASZLIB
 PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
@@ -1657,15 +1592,6 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)
 else
 UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
 endif
-ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)
-else
-ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),)
-UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)
-else
-UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)
-endif
-endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_PASZLIB)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
@@ -1683,9 +1609,6 @@ endif
 ifdef UNITDIR_PASZLIB
 override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB)
 endif
-ifdef UNITDIR_FPMAKE_PASZLIB
-override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB)
-endif
 endif
 ifndef NOCPUDEF
 override FPCOPTDEF=$(ARCH)
@@ -1798,7 +1721,7 @@ override FPCOPT+=-Aas
 endif
 endif
 ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifneq ($(findstring $(OS_TARGET),linux solaris),)
+ifeq ($(OS_TARGET),linux)
 ifeq ($(CPU_TARGET),x86_64)
 override FPCOPT+=-Cg
 endif
@@ -2097,7 +2020,6 @@ fpc_baseinfo:
 	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)  SourceSuffix. $(SOURCESUFFIX)
 	@$(ECHO)  TargetSuffix. $(TARGETSUFFIX)
-	@$(ECHO)  FPC fpmake... $(FPCFPMAKE)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)
diff --git a/packages/paszlib/examples/Makefile.fpc b/packages/paszlib/examples/Makefile.fpc
index 21c09686e2..7e2cc2b1ea 100644
--- a/packages/paszlib/examples/Makefile.fpc
+++ b/packages/paszlib/examples/Makefile.fpc
@@ -3,7 +3,7 @@
 #
 
 [target]
-programs=minigzip example minizip miniunz
+programs=minigzip example minizip miniunz example2
 
 [require]
 packages=paszlib
diff --git a/packages/paszlib/examples/example2.pas b/packages/paszlib/examples/example2.pas
new file mode 100644
index 0000000000..9c560e4c68
--- /dev/null
+++ b/packages/paszlib/examples/example2.pas
@@ -0,0 +1,33 @@
+program EnhancedZipperExample;
+
+{$mode objfpc}{$H+}
+
+uses
+  Classes, zstream, zipper;
+
+var
+   z: TZipper;
+   zfe: TZipFileEntry;
+begin
+  z:=TZipper.Create;
+  z.FileName:='fpcCompressionLevelTestFile.zip';
+  try
+    //Default Compression Level
+    zfe:=z.Entries.AddFileEntry(ParamStr(0));
+    //Compression Level = none ( Store )
+    zfe:=z.Entries.AddFileEntry(ParamStr(0));
+    zfe.CompressionLevel:=clnone;
+    z.ZipAllFiles;
+  finally
+    z.Free;
+  end;
+  {
+   The result can be checked with the command(On Linux):
+   unzip -v fpcCompressionLevelTestFile.zip
+   The column Method Shows different values to each file
+  }
+end.
+
+
+
+