diff --git a/dev-lang/fpc/fpc-2.6.2.recipe b/dev-lang/fpc/fpc-2.6.2.recipe
index 46c1ad5fc..59364e6a4 100644
--- a/dev-lang/fpc/fpc-2.6.2.recipe
+++ b/dev-lang/fpc/fpc-2.6.2.recipe
@@ -6,7 +6,7 @@ include Linux, FreeBSD, Haiku, Mac OS X/iOS/Darwin, DOS, Win32, Win64, WinCE, \
 OS/2, MorphOS, Nintendo GBA, Nintendo DS, and Nintendo Wii. Additionally, JVM, \
 MIPS (big and little endian variants) and Motorola 68k architecture targets \
 are available in the development versions."
-HOMEPAGE="http://www.freespascal.org"
+HOMEPAGE="http://www.freepascal.org"
 SOURCE_URI="http://sourceforge.net/projects/freepascal/files/Source/2.6.2/fpc-2.6.2.source.tar.gz/download"
 CHECKSUM_SHA256="71dd1be93593daf184556377dfde61c7882bc749ad8c0bc342210e542555f9d0"
 LICENSE="
@@ -14,13 +14,15 @@ LICENSE="
 	GNU GPL v3
 	"
 COPYRIGHT="1993-2013 by Florian Klaempfl"
-REVISION="1"
+REVISION="2"
 
 DISABLE_SOURCE_PACKAGE=yes
 
 ARCHITECTURES="x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
 fi
 SECONDARY_ARCHITECTURES="x86"
 
@@ -67,7 +69,6 @@ REQUIRES="
 	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	fpc == 2.6.2_bin
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
@@ -75,7 +76,7 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:tar
 	cmd:wget
-	cmd:fpc == 2.6.2_bin
+	fpc_bin = 2.6.2
 	"
 
 SOURCE_DIR="fpc-2.6.2"
@@ -85,7 +86,7 @@ SOURCE_DIR="fpc-2.6.2"
 #Create a .PackageInfo where the compiler is installed
 #Run package create -0 fpc-2.6.2-1-x86.hpkg
 #Put it on the common folders
-MESSAGE="This recipe requires an existing fpc-2.6.2_bin-1-x86.hpkg package"
+MESSAGE="This recipe requires an existing fpc_bin-2.6.2 package"
 
 BUILD()
 {
diff --git a/dev-lang/fpc/fpc-2.6.2_bin.recipe b/dev-lang/fpc/fpc_bin-2.6.2.recipe
similarity index 53%
rename from dev-lang/fpc/fpc-2.6.2_bin.recipe
rename to dev-lang/fpc/fpc_bin-2.6.2.recipe
index 6b5020339..0cb35dfde 100644
--- a/dev-lang/fpc/fpc-2.6.2_bin.recipe
+++ b/dev-lang/fpc/fpc_bin-2.6.2.recipe
@@ -1,11 +1,5 @@
-SUMMARY="An open source compiler for Pascal and Object Pascal"
-DESCRIPTION="Free Pascal (aka FPK Pascal) is a 32 and 64 bit professional \
-Pascal compiler. It can target multiple processor architectures: Intel x86, \
-AMD64/x86-64, PowerPC, PowerPC64, SPARC, and ARM. Supported operating systems \
-include Linux, FreeBSD, Haiku, Mac OS X/iOS/Darwin, DOS, Win32, Win64, WinCE, \
-OS/2, MorphOS, Nintendo GBA, Nintendo DS, and Nintendo Wii. Additionally, JVM, \
-MIPS (big and little endian variants) and Motorola 68k architecture targets \
-are available in the development versions."
+SUMMARY="Pre-built binaries for the FPC build"
+DESCRIPTION="Pre-built FPC binaries for Haiku i386."
 HOMEPAGE="http://www.freepascal.org"
 SOURCE_URI="ftp://freepascal.stack.nl/pub/fpc/dist/2.6.0/i386-haiku/fpc-2.6.0.i386-haiku.tar"
 CHECKSUM_SHA256="abec33111d1d88dcce96cf26498b3687d53aa29494c6a8aada16b9b0625eef95"
@@ -20,7 +14,13 @@ DISABLE_SOURCE_PACKAGE=yes
 
 BUILD_ACTIVATION_PHASE="INSTALL"
 
-ARCHITECTURES="x86"
+ARCHITECTURES="x86 !x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	fpc = $portVersion