diff --git a/ide/Makefile b/ide/Makefile
index b6872ea111..559e4af62b 100644
--- a/ide/Makefile
+++ b/ide/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/09/13]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -182,6 +182,7 @@ override OBJDIR+=$(GDBOBJDIR)
 else
 override UNITDIR+=fakegdb
 endif
+override UNITDIR+=$(PACKAGESDIR)/regexpr
 override TARGET_DIRS+=compiler fakegdb
 override TARGET_PROGRAMS+=fp
 override INSTALL_DATADIR=$(INSTALL_BASEDIR)/ide
@@ -604,46 +605,55 @@ ifeq ($(OS_TARGET),linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
+REQUIRE_PACKAGES_REGEXPR=1
 endif
 ifeq ($(OS_TARGET),go32v2)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
+REQUIRE_PACKAGES_REGEXPR=1
 endif
 ifeq ($(OS_TARGET),win32)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
+REQUIRE_PACKAGES_REGEXPR=1
 endif
 ifeq ($(OS_TARGET),os2)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
+REQUIRE_PACKAGES_REGEXPR=1
 endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
+REQUIRE_PACKAGES_REGEXPR=1
 endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
+REQUIRE_PACKAGES_REGEXPR=1
 endif
 ifeq ($(OS_TARGET),netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
+REQUIRE_PACKAGES_REGEXPR=1
 endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
+REQUIRE_PACKAGES_REGEXPR=1
 endif
 ifeq ($(OS_TARGET),atari)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
+REQUIRE_PACKAGES_REGEXPR=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
@@ -726,7 +736,34 @@ ifdef UNITDIR_GDBINT
 override COMPILER_UNITDIR+=$(UNITDIR_GDBINT)
 endif
 endif
-.PHONY: package_rtl package_fv package_gdbint
+ifdef REQUIRE_PACKAGES_REGEXPR
+PACKAGEDIR_REGEXPR:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /regexpr/Makefile.fpc,$(PACKAGESDIR)))))
+ifneq ($(PACKAGEDIR_REGEXPR),)
+PACKAGEDIR_REGEXPR:=$(firstword $(PACKAGEDIR_REGEXPR))
+ifeq ($(wildcard $(PACKAGEDIR_REGEXPR)/$(FPCMADE)),)
+override COMPILEPACKAGES+=package_regexpr
+package_regexpr:
+	$(MAKE) -C $(PACKAGEDIR_REGEXPR) all
+endif
+ifneq ($(wildcard $(PACKAGEDIR_REGEXPR)/$(OS_TARGET)),)
+UNITDIR_REGEXPR=$(PACKAGEDIR_REGEXPR)/$(OS_TARGET)
+else
+UNITDIR_REGEXPR=$(PACKAGEDIR_REGEXPR)
+endif
+else
+PACKAGEDIR_REGEXPR=
+UNITDIR_REGEXPR:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /regexpr/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_REGEXPR),)
+UNITDIR_REGEXPR:=$(firstword $(UNITDIR_REGEXPR))
+else
+UNITDIR_REGEXPR=
+endif
+endif
+ifdef UNITDIR_REGEXPR
+override COMPILER_UNITDIR+=$(UNITDIR_REGEXPR)
+endif
+endif
+.PHONY: package_rtl package_fv package_gdbint package_regexpr
 override FPCOPTDEF=$(CPU_TARGET)
 ifneq ($(OS_TARGET),$(OS_SOURCE))
 override FPCOPT+=-T$(OS_TARGET)
diff --git a/ide/Makefile.fpc b/ide/Makefile.fpc
index a98b2e582c..30237a4d2f 100644
--- a/ide/Makefile.fpc
+++ b/ide/Makefile.fpc
@@ -21,7 +21,7 @@ targetdir=.
 unitdir=compiler
 
 [require]
-packages=fv gdbint
+packages=fv gdbint regexpr
 
 [default]
 fpcdir=..
@@ -101,6 +101,7 @@ else
 override UNITDIR+=fakegdb
 endif
 
+override UNITDIR+=$(PACKAGESDIR)/regexpr
 
 [rules]
 .PHONY: compilerunits compilerclean \