diff --git a/.gitattributes b/.gitattributes
index ee510b97e2..a393cedcfe 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9514,8 +9514,8 @@ utils/h2pas/h2pas.pas svneol=native#text/plain
 utils/h2pas/h2pas.y -text
 utils/h2pas/h2paspp.pas svneol=native#text/plain
 utils/h2pas/h2plexlib.pas svneol=native#text/plain
+utils/h2pas/h2poptions.pas svneol=native#text/plain
 utils/h2pas/h2pyacclib.pas svneol=native#text/plain
-utils/h2pas/options.pas svneol=native#text/plain
 utils/h2pas/scan.l -text
 utils/h2pas/scan.pas svneol=native#text/plain
 utils/h2pas/testit.h -text
diff --git a/utils/h2pas/Makefile b/utils/h2pas/Makefile
index 2eb3ba3a04..04df7c3e52 100644
--- a/utils/h2pas/Makefile
+++ b/utils/h2pas/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/03]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/12]
 #
 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 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-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
@@ -432,178 +432,178 @@ ifeq ($(FULL_TARGET),armeb-embedded)
 override TARGET_PROGRAMS+=h2pas h2paspp
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override CLEAN_UNITS+=options lexlib scan yacclib converu
+override CLEAN_UNITS+=h2poptions h2plexlib scan h2pyacclib converu
 endif
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
@@ -2265,7 +2265,7 @@ else
 export PLEX:=$(firstword $(PLEX))
 endif
 endif
-h2pas$(EXEEXT): h2pas.pas scan.pas options.pas
+h2pas$(EXEEXT): h2pas.pas scan.pas h2poptions.pas
 ifdef  PYACC
 h2pas.pas: h2pas.y
 	$(PYACC) h2pas.y
diff --git a/utils/h2pas/Makefile.fpc b/utils/h2pas/Makefile.fpc
index 74e4c8cf89..d4a8506491 100644
--- a/utils/h2pas/Makefile.fpc
+++ b/utils/h2pas/Makefile.fpc
@@ -6,7 +6,7 @@
 programs=h2pas h2paspp
 
 [clean]
-units=options lexlib scan yacclib converu
+units=h2poptions h2plexlib scan h2pyacclib converu
 
 [compiler]
 options=-Sg
@@ -39,7 +39,7 @@ export PLEX:=$(firstword $(PLEX))
 endif
 endif
 
-h2pas$(EXEEXT): h2pas.pas scan.pas options.pas
+h2pas$(EXEEXT): h2pas.pas scan.pas h2poptions.pas
 
 #
 # Lex and Yacc (only if pyacc is found)
diff --git a/utils/h2pas/h2pas.pas b/utils/h2pas/h2pas.pas
index da924fbce7..cfaf854e74 100644
--- a/utils/h2pas/h2pas.pas
+++ b/utils/h2pas/h2pas.pas
@@ -28,7 +28,7 @@ program h2pas;
 
    uses
      SysUtils,types, classes,
-     options,scan,converu,h2plexlib,h2pyacclib;
+     h2poptions,scan,converu,h2plexlib,h2pyacclib;
 
    type
      YYSTYPE = presobject;
diff --git a/utils/h2pas/h2pas.y b/utils/h2pas/h2pas.y
index eebdb6ae51..d795c00dac 100644
--- a/utils/h2pas/h2pas.y
+++ b/utils/h2pas/h2pas.y
@@ -24,7 +24,7 @@ program h2pas;
 
    uses
      SysUtils,types, classes,
-     options,scan,converu,h2plexlib,h2pyacclib;
+     h2poptions,scan,converu,h2plexlib,h2pyacclib;
 
    type
      YYSTYPE = presobject;
diff --git a/utils/h2pas/options.pas b/utils/h2pas/h2poptions.pas
similarity index 99%
rename from utils/h2pas/options.pas
rename to utils/h2pas/h2poptions.pas
index daf17515b9..3d8cda2121 100644
--- a/utils/h2pas/options.pas
+++ b/utils/h2pas/h2poptions.pas
@@ -16,7 +16,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
  ****************************************************************************}
-unit options;
+unit h2poptions;
 interface
 
 const
@@ -101,7 +101,7 @@ begin
   begin
     Dec(i);
   end;
-  ExtractFileName := Copy(AFilePath,i+1,Length(AFilePath)); 
+  ExtractFileName := Copy(AFilePath,i+1,Length(AFilePath));
 end;
 
 {*****************************************************************************
diff --git a/utils/h2pas/scan.l b/utils/h2pas/scan.l
index 6995879088..c21a669014 100644
--- a/utils/h2pas/scan.l
+++ b/utils/h2pas/scan.l
@@ -229,7 +229,7 @@ type
   implementation
 
     uses
-       options,converu;
+       h2poptions,converu;
 
     const
        newline = #10;
diff --git a/utils/h2pas/scan.pas b/utils/h2pas/scan.pas
index f4d625525c..d27473a552 100644
--- a/utils/h2pas/scan.pas
+++ b/utils/h2pas/scan.pas
@@ -232,7 +232,7 @@ type
   implementation
 
     uses
-       options,converu;
+       h2poptions,converu;
 
     const
        newline = #10;