diff --git a/packages/extra/os2units/Makefile b/packages/extra/os2units/Makefile
index 0edc6f256b..8324a6088e 100644
--- a/packages/extra/os2units/Makefile
+++ b/packages/extra/os2units/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/01/14]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/12/27]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos macosx
+MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
@@ -111,11 +111,38 @@ endif
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
 ifndef FPC_VERSION
-FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)
-FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
+FPC_VERSION:=$(shell $(FPC) -iV)
 endif
-export FPC FPC_VERSION FPC_COMPILERINFO
+export FPC FPC_VERSION
 unexport CHECKDEPEND ALLDEPENDENCIES
+ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
+COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
+ifndef CPU_SOURCE
+CPU_SOURCE:=$(word 1,$(COMPILERINFO))
+endif
+ifndef CPU_TARGET
+CPU_TARGET:=$(word 2,$(COMPILERINFO))
+endif
+ifndef OS_SOURCE
+OS_SOURCE:=$(word 3,$(COMPILERINFO))
+endif
+ifndef OS_TARGET
+OS_TARGET:=$(word 4,$(COMPILERINFO))
+endif
+else
+ifndef CPU_SOURCE
+CPU_SOURCE:=$(shell $(FPC) -iSP)
+endif
+ifndef CPU_TARGET
+CPU_TARGET:=$(shell $(FPC) -iTP)
+endif
+ifndef OS_SOURCE
+OS_SOURCE:=$(shell $(FPC) -iSO)
+endif
+ifndef OS_TARGET
+OS_TARGET:=$(shell $(FPC) -iTO)
+endif
+endif
 ifndef CPU_TARGET
 ifdef CPU_TARGET_DEFAULT
 CPU_TARGET=$(CPU_TARGET_DEFAULT)
@@ -126,24 +153,6 @@ ifdef OS_TARGET_DEFAULT
 OS_TARGET=$(OS_TARGET_DEFAULT)
 endif
 endif
-ifneq ($(words $(FPC_COMPILERINFO)),5)
-FPC_COMPILERINFO+=$(shell $(FPC) -iSP)
-FPC_COMPILERINFO+=$(shell $(FPC) -iTP)
-FPC_COMPILERINFO+=$(shell $(FPC) -iSO)
-FPC_COMPILERINFO+=$(shell $(FPC) -iTO)
-endif
-ifndef CPU_SOURCE
-CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))
-endif
-ifndef CPU_TARGET
-CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))
-endif
-ifndef OS_SOURCE
-OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))
-endif
-ifndef OS_TARGET
-OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
-endif
 FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
 FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
 ifneq ($(FULL_TARGET),$(FULL_SOURCE))
@@ -203,7 +212,7 @@ else
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
-override TARGET_DIRS+=ftpapi
+override TARGET_DIRS+=ftpapi mmtk
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCSUBDIR=packages
 ifdef REQUIRE_UNITSDIR
@@ -535,15 +544,6 @@ FPCMADE=fpcmade.nw
 ZIPSUFFIX=nw
 EXEEXT=.nlm
 endif
-ifeq ($(OS_TARGET),macos)
-PPUEXT=.ppu
-ASMEXT=.s
-OEXT=.o
-SMARTEXT=.sl
-STATICLIBEXT=.a
-EXEEXT=
-FPCMADE=fpcmade.mcc
-endif
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
@@ -855,11 +855,6 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
 override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
 endif
 endif
-ifeq ($(OS_TARGET),linux)
-ifeq ($(FPC_VERSION),1.0.6)
-override FPCOPTDEF+=HASUNIX
-endif
-endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
@@ -1035,6 +1030,7 @@ fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIR
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
 TARGET_DIRS_FTPAPI=1
+TARGET_DIRS_MMTK=1
 ifdef TARGET_DIRS_FTPAPI
 ftpapi_all:
 	$(MAKE) -C ftpapi all
@@ -1078,6 +1074,49 @@ ftpapi:
 	$(MAKE) -C ftpapi all
 .PHONY: ftpapi_all ftpapi_debug ftpapi_smart ftpapi_release ftpapi_examples ftpapi_shared ftpapi_install ftpapi_sourceinstall ftpapi_exampleinstall ftpapi_distinstall ftpapi_zipinstall ftpapi_zipsourceinstall ftpapi_zipexampleinstall ftpapi_zipdistinstall ftpapi_clean ftpapi_distclean ftpapi_cleanall ftpapi_info ftpapi_makefiles ftpapi
 endif
+ifdef TARGET_DIRS_MMTK
+mmtk_all:
+	$(MAKE) -C mmtk all
+mmtk_debug:
+	$(MAKE) -C mmtk debug
+mmtk_smart:
+	$(MAKE) -C mmtk smart
+mmtk_release:
+	$(MAKE) -C mmtk release
+mmtk_examples:
+	$(MAKE) -C mmtk examples
+mmtk_shared:
+	$(MAKE) -C mmtk shared
+mmtk_install:
+	$(MAKE) -C mmtk install
+mmtk_sourceinstall:
+	$(MAKE) -C mmtk sourceinstall
+mmtk_exampleinstall:
+	$(MAKE) -C mmtk exampleinstall
+mmtk_distinstall:
+	$(MAKE) -C mmtk distinstall
+mmtk_zipinstall:
+	$(MAKE) -C mmtk zipinstall
+mmtk_zipsourceinstall:
+	$(MAKE) -C mmtk zipsourceinstall
+mmtk_zipexampleinstall:
+	$(MAKE) -C mmtk zipexampleinstall
+mmtk_zipdistinstall:
+	$(MAKE) -C mmtk zipdistinstall
+mmtk_clean:
+	$(MAKE) -C mmtk clean
+mmtk_distclean:
+	$(MAKE) -C mmtk distclean
+mmtk_cleanall:
+	$(MAKE) -C mmtk cleanall
+mmtk_info:
+	$(MAKE) -C mmtk info
+mmtk_makefiles:
+	$(MAKE) -C mmtk makefiles
+mmtk:
+	$(MAKE) -C mmtk all
+.PHONY: mmtk_all mmtk_debug mmtk_smart mmtk_release mmtk_examples mmtk_shared mmtk_install mmtk_sourceinstall mmtk_exampleinstall mmtk_distinstall mmtk_zipinstall mmtk_zipsourceinstall mmtk_zipexampleinstall mmtk_zipdistinstall mmtk_clean mmtk_distclean mmtk_cleanall mmtk_info mmtk_makefiles mmtk
+endif
 all: $(addsuffix _all,$(TARGET_DIRS))
 debug: $(addsuffix _debug,$(TARGET_DIRS))
 smart: $(addsuffix _smart,$(TARGET_DIRS))
diff --git a/packages/extra/os2units/Makefile.fpc b/packages/extra/os2units/Makefile.fpc
index 07f670077d..6301b9be7a 100644
--- a/packages/extra/os2units/Makefile.fpc
+++ b/packages/extra/os2units/Makefile.fpc
@@ -3,7 +3,7 @@
 #
 
 [target]
-dirs=ftpapi
+dirs=ftpapi mmtk
 
 [install]
 fpcpackage=y