diff --git a/.gitattributes b/.gitattributes
index e49b7a9adb..926cc10abd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1031,7 +1031,7 @@ lcl/lmessages.pp svneol=native#text/pascal
 lcl/lresources.pp svneol=native#text/pascal
 lcl/maskedit.pp svneol=native#text/pascal
 lcl/menus.pp svneol=native#text/pascal
-lcl/messages.pp svneol=native#text/pascal
+lcl/nonwin32/messages.pp svneol=native#text/pascal
 lcl/pairsplitter.pas svneol=native#text/pascal
 lcl/postscriptprinter.pas svneol=native#text/pascal
 lcl/printers.pas svneol=native#text/pascal
diff --git a/lcl/Makefile b/lcl/Makefile
index 4a4afda258..b260cd2dcc 100644
--- a/lcl/Makefile
+++ b/lcl/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/06]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/22]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@@ -10,6 +10,7 @@ SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
 else
 SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
+SEARCHPATH+=$(patsubst %/,%,$(dir $(MAKE)))
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
 PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
@@ -244,6 +245,9 @@ override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../components $(LCLD
 export LCLDIR LCLUNITDIR LCLCOMPONENTDIR
 override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)
 override COMPILER_UNITDIR+=$(LCLUNITDIR)
+ifneq ($(OS_TARGET),win32)
+NONWIN32=nonwin32
+endif
 override TARGET_DIRS+=interfaces
 override TARGET_UNITS+=allunits
 override TARGET_IMPLICITUNITS+=arrow actnlist buttons calendar clipbrd clistbox comctrls commctrl controls dialogs dynamicarray  dynhasharray extctrls extendedstrings filectrl forms graphics graphmath graphtype grids imglist interfacebase lazlinkedlist lclmemmanager lclintf lclstrconsts lcltype lmessages lresources maskedit menus messages registry spin stdctrls stringhashlist toolwin utrace vclglobals printers postscriptprinter dbctrls dbgrids
@@ -252,7 +256,7 @@ override CLEAN_FILES+=$(wildcard units/*$(OEXT)) $(wildcard units/*$(PPUEXT)) $(
 override INSTALL_BUILDUNIT=allunits
 override COMPILER_OPTIONS+=-gl
 override COMPILER_INCLUDEDIR+=include
-override COMPILER_UNITDIR+=.
+override COMPILER_UNITDIR+=. $(NONWIN32)
 override COMPILER_UNITTARGETDIR+=units
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -447,16 +451,16 @@ endif
 else
 CROSSBINDIR=
 endif
-ifdef inUnix
+ifeq ($(OS_SOURCE),linux)
 ifndef GCCLIBDIR
 GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
 endif
-ifeq ($(OS_TARGET),linux)
 ifndef OTHERLIBDIR
 OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
 endif
 endif
-ifeq ($(OS_TARGET),netbsd)
+ifdef inUnix
+ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR+=/usr/pkg/lib
 endif
 export GCCLIBDIR OTHERLIB
@@ -855,15 +859,17 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
-ASNAME=as
-LDNAME=ld
-ARNAME=ar
-RCNAME=rc
+ASNAME=$(BINUTILSPREFIX)as
+LDNAME=$(BINUTILSPREFIX)ld
+ARNAME=$(BINUTILSPREFIX)ar
+RCNAME=$(BINUTILSPREFIX)rc
+ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),win32)
 ASNAME=asw
 LDNAME=ldw
 ARNAME=arw
 endif
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
 ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
@@ -1568,6 +1574,11 @@ endif
 ifeq ($(OS_SOURCE),openbsd)
 override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
+ifndef CROSSBOOTSTRAP
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-XP$(BINUTILSPREFIX)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
diff --git a/lcl/Makefile.fpc b/lcl/Makefile.fpc
index f4f71fc86b..f5e24330f5 100644
--- a/lcl/Makefile.fpc
+++ b/lcl/Makefile.fpc
@@ -27,10 +27,6 @@ packages=fcl
 [prerules]
 ifneq ($(OS_TARGET),win32)
 NONWIN32=nonwin32
-else
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
-NONWIN32=nonwin32
-endif
 endif
 
 [compiler]
diff --git a/lcl/messages.pp b/lcl/nonwin32/messages.pp
similarity index 100%
rename from lcl/messages.pp
rename to lcl/nonwin32/messages.pp