diff --git a/.cvsignore b/.cvsignore
index dc28a46..fb14e70 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 fpcbuild-2.2.0.tar.gz
 fpc-2.2.0-samplecfg_32and64bit.patch
 fpc-2.2.0.compiler.bin.tar.gz
+fpc-2.2.0-build-id.patch
diff --git a/fpc.spec b/fpc.spec
index 55e7349..c97bbcd 100644
--- a/fpc.spec
+++ b/fpc.spec
@@ -4,7 +4,7 @@
 
 Name:           fpc
 Version:        2.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
@@ -15,6 +15,7 @@ Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}b
 Source1:        http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
 %endif
 Patch0:         %{name}-%{version}-samplecfg_32and64bit.patch
+Patch1:         %{name}-%{version}-build-id.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       gpm, glibc, ncurses, binutils
@@ -75,6 +76,7 @@ automatical-code generation purposes.
 %setup -n fpcbuild-%{version} -q
 %endif
 %patch0
+%patch1
 
 %build
 # The source-files:
@@ -93,14 +95,14 @@ cd fpcsrc
 NEWPP=`pwd`/compiler/%{ppcname}
 NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
 DATA2INC=`pwd`/utils/data2inc
-make compiler_cycle FPC=${STARTPP} OPT='-gl'
-make rtl_clean rtl%{smart} FPC=${NEWPP} OPT='-gl'
-make packages_base%{smart} FPC=${NEWPP} OPT='-gl'
-make packages_fcl%{smart} FPC=${NEWPP} OPT='-gl'
-make fv%{smart} FPC=${NEWPP} OPT='-gl'
-make packages_extra%{smart} FPC=${NEWPP} OPT='-gl'
-make ide_all FPC=${NEWPP} OPT='-gl'
-make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC} OPT='-gl'
+make compiler_cycle FPC=${STARTPP} OPT='-gl -k--build-id'
+make rtl_clean rtl%{smart} FPC=${NEWPP} OPT='-gl -k--build-id'
+make packages_base%{smart} FPC=${NEWPP} OPT='-gl -k--build-id'
+make packages_fcl%{smart} FPC=${NEWPP} OPT='-gl -k--build-id'
+make fv%{smart} FPC=${NEWPP} OPT='-gl -k--build-id'
+make packages_extra%{smart} FPC=${NEWPP} OPT='-gl -k--build-id'
+make ide_all FPC=${NEWPP} OPT='-gl -k--build-id'
+make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC} OPT='-gl -k--build-id'
 
 cd ..
 make -C fpcdocs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
@@ -177,6 +179,9 @@ rm -rf %{buildroot}
 %{_datadir}/fpcsrc
 
 %changelog
+* Mon Oct 16 2007 Joost van der Sluis <joost@cnoc.nl> 2.2.0-4
+- Enabled BuildId, added it to fpc.cfg
+
 * Mon Oct 16 2007 Joost van der Sluis <joost@cnoc.nl> 2.2.0-3
 - Disabled smart-linking on ppc64
 
diff --git a/sources b/sources
index c183421..d06c250 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 0869cfd07d012b702ff08c0a4196624b  fpcbuild-2.2.0.tar.gz
 01fb41d3a6b0536939f63d684d916e5f  fpc-2.2.0-samplecfg_32and64bit.patch
 d78b19b59457bb98dacb6e3267fe3714  fpc-2.2.0.compiler.bin.tar.gz
+02d1e509ba590b7de0817f69658f047f  fpc-2.2.0-build-id.patch