diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/development/compilers/fpc/binary-builder.sh
index 16f1a0f761f..8be36dec73e 100755
--- a/pkgs/development/compilers/fpc/binary-builder.sh
+++ b/pkgs/development/compilers/fpc/binary-builder.sh
@@ -7,6 +7,7 @@ echo "Deploying binaries.."
 mkdir $out
 cd $out
 for i in $tarballdir/*.gz; do tar xvf $i; done
-echo "Creating ppc386 symlink.."
-ln -fs $out/lib/fpc/*/ppc386 $out/bin/ppc386
-
+echo 'Creating ppc* symlink..'
+for i in $out/lib/fpc/*/ppc*; do
+  ln -fs $i $out/bin/$(basename $i)
+done
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index fe415758db5..2d6cadf07fd 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
       sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
     '' else "";
 
-  preBuild = ''
-    fpcmake
-  '';
-
   makeFlags = "NOGDB=1";
 
   installFlags = "INSTALL_PREFIX=\${out}";