diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 6c797b74c5..28af1eadeb 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -387,6 +387,9 @@ HOST_ASFLAGS = ;
 HOST_CCFLAGS += -Wno-multichar ;
 HOST_C++FLAGS += -Wno-multichar ;
 
+HOST_PIC_CCFLAGS += -fPIC ;
+HOST_PIC_C++FLAGS += -fPIC ;
+
 HOST_KERNEL_CCFLAGS += -finline -fno-builtin
 	-DBOCHS_DEBUG_HACK=$(BOCHS_DEBUG_HACK) -D_KERNEL_MODE ;
 HOST_KERNEL_C++FLAGS += -finline -fno-builtin -fno-exceptions
diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index 25cfe2cba6..6a16ae79d4 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -465,6 +465,10 @@ rule BuildPlatformSharedLibrary
 		LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ]
 			-shared -Xlinker -soname=\"$(target:G=)\" ;
 	}
+
+    local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
+	CCFLAGS on $(objects) += $(HOST_PIC_CCFLAGS) ; 
+	C++FLAGS on $(objects) += $(HOST_PIC_C++FLAGS) ; 
 }
 
 rule BuildPlatformMergeObject
@@ -489,10 +493,32 @@ rule BuildPlatformMergeObject
 		# propagate the flag to the objects
 		USES_BE_API on $(objects) = $(usesBeAPI) ;
 	}
-	
+
 	MergeObject $(target) : $(sources) : $(otherObjects) ;
 }
 
+rule BuildPlatformMergeObjectPIC
+{
+	# BuildPlatformMergeObjectPIC <name> : <sources> : <other objects> ;
+	# Compiles source files and merges the object files to an object file.
+	# Same as BuildPlatformMergeObject rule but adds position-independent
+	# flags to the compiler (if any).
+	# <name>: Name of the object file to create. No grist will be added.
+	# <sources>: Sources to be compiled. Grist will be added.
+	# <other objects>: Object files or static libraries to be merged. No grist
+	#                  will be added.
+	#
+	local target = $(1) ;
+	local sources = $(2) ;
+	local otherObjects = $(3) ;
+
+	local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
+	CCFLAGS on $(objects) += $(HOST_PIC_CCFLAGS) ; 
+	C++FLAGS on $(objects) += $(HOST_PIC_C++FLAGS) ; 
+
+	BuildPlatformMergeObject $(target) : $(sources) : $(otherObjects) ;
+}
+
 rule BuildPlatformStaticLibrary
 {
 	# BuildPlatformStaticLibrary <lib> : <sources> ;
diff --git a/src/build/libbe/app/Jamfile b/src/build/libbe/app/Jamfile
index 9b73a57603..0e2b22eb2a 100644
--- a/src/build/libbe/app/Jamfile
+++ b/src/build/libbe/app/Jamfile
@@ -5,7 +5,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers build private shared ] : true ;
 
 USES_BE_API on <libbe_build>app_kit.o = true ;
 
-BuildPlatformMergeObject <libbe_build>app_kit.o :
+BuildPlatformMergeObjectPIC <libbe_build>app_kit.o :
  	Application.cpp
  	AppMisc.cpp
 	Message.cpp
diff --git a/src/build/libbe/interface/Jamfile b/src/build/libbe/interface/Jamfile
index 839678fedb..4151349619 100644
--- a/src/build/libbe/interface/Jamfile
+++ b/src/build/libbe/interface/Jamfile
@@ -6,7 +6,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers build private shared ] : true ;
 
 USES_BE_API on <libbe_build>interface_kit.o = true ;
 
-BuildPlatformMergeObject <libbe_build>interface_kit.o :
+BuildPlatformMergeObjectPIC <libbe_build>interface_kit.o :
 	Bitmap.cpp
  	GraphicsDefs.cpp
  	Point.cpp
diff --git a/src/build/libbe/storage/Jamfile b/src/build/libbe/storage/Jamfile
index 6f4133aa7a..b0e4855ceb 100644
--- a/src/build/libbe/storage/Jamfile
+++ b/src/build/libbe/storage/Jamfile
@@ -9,7 +9,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) mime ] ;
 
 USES_BE_API on <libbe_build>storage_kit.o = true ;
 
-BuildPlatformMergeObject <libbe_build>storage_kit.o :
+BuildPlatformMergeObjectPIC <libbe_build>storage_kit.o :
 	AppFileInfo.cpp
 	Directory.cpp
 	Entry.cpp
diff --git a/src/build/libbe/support/Jamfile b/src/build/libbe/support/Jamfile
index c84960c9d9..41dd5e9bf3 100644
--- a/src/build/libbe/support/Jamfile
+++ b/src/build/libbe/support/Jamfile
@@ -5,7 +5,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers build private app ] : true ;
 
 USES_BE_API on <libbe_build>support_kit.o = true ;
 
-BuildPlatformMergeObject <libbe_build>support_kit.o :
+BuildPlatformMergeObjectPIC <libbe_build>support_kit.o :
 	Archivable.cpp
 	BlockCache.cpp
 	ByteOrder.cpp