Index: /trunk/src/VBox/Installer/freebsd/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/freebsd/Makefile.kmk	(revision 23631)
+++ /trunk/src/VBox/Installer/freebsd/Makefile.kmk	(revision 23632)
@@ -51,10 +51,7 @@
 OTHER_CLEAN   += \
 	$(addprefix $(VBOX_FBSD_INST_STAGE_DIR)/,\
-		postinstall.sh \
-		uninstall.sh \
+		pkg_plist \
 		LICENSE) \
-	$(wildcard $(VBOX_FBSD_INST_OUT_DIR)/VirtualBox-*) \
-	$(addprefix $(VBOX_FBSD_INST_OUT_DIR)/,\
-		postinstall.sh)
+	$(wildcard $(VBOX_FBSD_INST_OUT_DIR)/VirtualBox-*)
 
 #
@@ -113,4 +110,5 @@
 		VBoxOGLhosterrorspu.so \
 		VBoxOGLrenderspu.so \
+		VBoxTestOGL \
 		VBoxSharedCrOpenGL.so,) \
 	$(if $(VBOX_WITH_PYTHON),VBoxPython.so,)
@@ -240,4 +238,5 @@
 $(PATH_BIN)/$(VBOX_FBSD_PACKAGE_NAME): \
 		$(VBOX_VERSION_STAMP) \
+		$(VBOX_FBSD_INST_OUT_DIR)/pkg_plist \
 		$(addprefix $(VBOX_FBSD_INST_LIBVBOX_DIR)/,$(VBOX_FBSD_ARCH_FILES)) \
 		$(addprefix $(VBOX_FBSD_INST_BIN_DIR)/,$(VBOX_FBSD_SYMLINKS)) \
@@ -254,5 +253,5 @@
 		-c $(VBOX_PATH_FBSD_INST_SRC)/pkg-comment \
 		-d $(VBOX_PATH_FBSD_INST_SRC)/pkg-descr \
-		-f $(VBOX_PATH_FBSD_INST_SRC)/pkg_plist \
+		-f $(VBOX_FBSD_INST_OUT_DIR)/pkg_plist \
 		-p /usr/local \
 		-s $(VBOX_FBSD_INST_STAGE_DIR) \
@@ -311,4 +310,15 @@
 	$(QUIET)$(INSTALL) -m 0644 $< $@
 
+# Create pkg_plist
+$(VBOX_FBSD_INST_OUT_DIR)/pkg_plist: \
+		$(VBOX_PATH_FBSD_INST_SRC)/pkg_plist
+	$(call MSG_INST_FILE,$<,$@)
+	$(QUIET)$(INSTALL) -d $(dir $@)
+	$(QUIET)$(SED) \
+		-e "s;_VBOX_REM_32BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM32.so,);g" \
+		-e "s;_VBOX_REM_64BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM64.so,);g" \
+		--output $@ \
+		$<
+
 include $(KBUILD_PATH)/subfooter.kmk
 
Index: /trunk/src/VBox/Installer/freebsd/pkg_plist
===================================================================
--- /trunk/src/VBox/Installer/freebsd/pkg_plist	(revision 23631)
+++ /trunk/src/VBox/Installer/freebsd/pkg_plist	(revision 23632)
@@ -31,4 +31,7 @@
 lib/virtualbox/webtest
 lib/virtualbox/rdesktop-vrdp
+lib/virtualbox/VBoxTestOGL
+_VBOX_REM_32BIT_MODULE_
+_VBOX_REM_64BIT_MODULE_
 @mode 4755
 lib/virtualbox/VBoxSDL