diff --git a/dev-lang/fpc/fpc_bin-2.6.4.recipe b/dev-lang/fpc_bootstrap/fpc_bin-2.6.4.recipe
similarity index 100%
rename from dev-lang/fpc/fpc_bin-2.6.4.recipe
rename to dev-lang/fpc_bootstrap/fpc_bin-2.6.4.recipe
diff --git a/dev-lang/fpc/fpc_bin-3.0.0.recipe b/dev-lang/fpc_bootstrap/fpc_bin-3.0.0.recipe
similarity index 85%
rename from dev-lang/fpc/fpc_bin-3.0.0.recipe
rename to dev-lang/fpc_bootstrap/fpc_bin-3.0.0.recipe
index 797f10179..01fb90df3 100644
--- a/dev-lang/fpc/fpc_bin-3.0.0.recipe
+++ b/dev-lang/fpc_bootstrap/fpc_bin-3.0.0.recipe
@@ -53,6 +53,18 @@ PROVIDES="
 	cmd:rmcvsdir = $portVersion
 	cmd:rstconv = $portVersion
 	cmd:unitdiff = $portVersion
+	cmd:cvsco.tdf = $portVersion
+	cmd:cvsdiff.tdf = $portVersion
+	cmd:cvsup.tdf = $portVersion
+	cmd:fp.ans = $portVersion
+	cmd:gplprog.pt = $portVersion
+	cmd:gplunit.pt = $portVersion
+	cmd:grep.tdf = $portVersion
+	cmd:makeskel.rsj = $portVersion
+	cmd:program.pt = $portVersion
+	cmd:ptop.rsj = $portVersion
+	cmd:tpgrep.tdf = $portVersion
+	cmd:unit.pt = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -80,6 +92,9 @@ INSTALL()
 	mkdir -p $docDir/examples
 	tar -xzf doc-pdf.tar.gz -C $docDir --strip 1
 	tar -xzf demo.tar.gz -C $docDir/examples
+	
+	rm -dR $prefix/{doc,share}
+	
 	ln -s ../lib/fpc/3.0.0/ppc386 ../../packaging/fpc_bin/bin/ppc386
 	# generate configuration file
 	pwd
diff --git a/dev-lang/fpc/fpc_bin-3.0.2.recipe b/dev-lang/fpc_bootstrap/fpc_bin-3.0.2.recipe
similarity index 96%
rename from dev-lang/fpc/fpc_bin-3.0.2.recipe
rename to dev-lang/fpc_bootstrap/fpc_bin-3.0.2.recipe
index 01100ba3c..66932b9ef 100644
--- a/dev-lang/fpc/fpc_bin-3.0.2.recipe
+++ b/dev-lang/fpc_bootstrap/fpc_bin-3.0.2.recipe
@@ -13,7 +13,7 @@ LICENSE="
 	GNU LGPL v3
 	GNU GPL v3"
 REVISION="1"
-SOURCE_URI="http://sourceforge.net/projects/freepascal/files/Haiku/$portVersion/fpc-$portVersion.i386-haiku.tar"
+SOURCE_URI="https://sourceforge.net/projects/freepascal/files/Haiku/$portVersion/fpc-$portVersion.i386-haiku.tar"
 CHECKSUM_SHA256="f3e1cdd1e5f354d7436313f07ec5fbee91f7b02df01433b30902609b3bb3d2ea"
 SOURCE_DIR="fpc-$portVersion.i386-haiku"
 DISABLE_SOURCE_PACKAGE="YES"