Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 16013)
+++ /trunk/Config.kmk	(revision 16014)
@@ -2406,4 +2406,8 @@
 	/usr/X11R6/include \
 	/usr/local/include
+TEMPLATE_VBOXR3EXE_LIBPATH            += \
+	/usr/lib \
+	/usr/X11R6/lib \
+	/usr/local/lib
  else ifeq ($(KBUILD_TARGET),solaris)
 TEMPLATE_VBOXR3EXE_TOOL                = GXX3PLAIN
@@ -2746,5 +2750,9 @@
 	/usr/X11R6/include \
 	/usr/local/include
- else ifeq ($(KBUILD_TARGET),solaris)
+TEMPLATE_VBOXMAINEXE_LIBPATH            += \
+	/usr/lib \
+	/usr/X11R6/lib \
+	/usr/local/lib
+else ifeq ($(KBUILD_TARGET),solaris)
 TEMPLATE_VBOXMAINEXE_TOOL                = GXX3PLAIN
 TEMPLATE_VBOXMAINEXE_DEFS               += _REENTRANT
@@ -2991,7 +2999,11 @@
   ifeq ($(KBUILD_TARGET),freebsd)
    TEMPLATE_VBOXQTGUIEXE_INCS += \
-	/usr/include \
-	/usr/X11R6/include \
-	/usr/local/include
+   	/usr/include \
+   	/usr/X11R6/include \
+   	/usr/local/include
+   TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
+   	/usr/lib \
+   	/usr/X11R6/lib \
+   	/usr/local/lib
   endif
   ifeq ($(KBUILD_TARGET),solaris)
@@ -3216,7 +3228,11 @@
   ifeq ($(KBUILD_TARGET),freebsd)
    TEMPLATE_VBOXQT4GUIEXE_INCS += \
-	/usr/include \
-	/usr/X11R6/include \
-	/usr/local/include
+   	/usr/include \
+   	/usr/X11R6/include \
+   	/usr/local/include
+   TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \
+   	/usr/lib \
+   	/usr/X11R6/lib \
+   	/usr/local/lib
   endif
   ifeq ($(KBUILD_TARGET),solaris)
@@ -3369,4 +3385,8 @@
 	/usr/X11R6/include \
 	/usr/local/include
+TEMPLATE_VBOXBLDPROG_LIBPATH            += \
+	/usr/lib \
+	/usr/X11R6/lib \
+	/usr/local/lib
  else ifeq ($(KBUILD_HOST),solaris)
 TEMPLATE_VBOXBLDPROG_TOOL                = GXX3PLAIN
@@ -3453,4 +3473,7 @@
  TEMPLATE_VBOXGUESTR3EXE_LIBS     = pthread rt m
 endif
+if1of ($(KBUILD_TARGET),freebsd netbsd openbsd)
+ TEMPLATE_VBOXGUESTR3EXE_LIBS     = $(TEMPLATE_VBOXR3EXE_LIBS) iconv
+endif
 
 #
Index: /trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk	(revision 16013)
+++ /trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk	(revision 16014)
@@ -42,9 +42,4 @@
 	$(VBOX_LIB_IPRT_GUEST_R3) \
 	$(VBOX_LIB_VBGL_R3)
-## @todo r=bird: Move to the template.
-VBoxService_LIBS.freebsd = \
-	iconv
-VBoxService_LIBPATH.freebsd = \
-	/usr/local/lib
 
 include	$(KBUILD_PATH)/subfooter.kmk
Index: /trunk/src/VBox/Additions/x11/xclient/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/x11/xclient/Makefile.kmk	(revision 16013)
+++ /trunk/src/VBox/Additions/x11/xclient/Makefile.kmk	(revision 16014)
@@ -37,4 +37,6 @@
 VBoxClient_LIBPATH = \
 	$(VBOX_LIBPATH32_X11)
+VBoxClient_LIBS.freebsd = \
+	iconv
 VBoxClient_LIBS = \
 	$(VBOX_LIB_IPRT_GUEST_R3) \
@@ -47,10 +49,4 @@
 	supc++ \
 	gcc_eh
-
-## @todo r=bird: move to the template (that's what they are there for). ditto for VBoxService.
-VBoxClient_LIBPATH.freebsd += \
-	/usr/local/lib
-VBoxClient_LIBS.freebsd += \
-	iconv
 ifdef VBOX_X11_SEAMLESS_GUEST
  VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE
Index: /trunk/src/VBox/Runtime/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Runtime/Makefile.kmk	(revision 16013)
+++ /trunk/src/VBox/Runtime/Makefile.kmk	(revision 16014)
@@ -740,6 +740,4 @@
 VBoxRT_LIBS.solaris            = \
 	kstat
-VBoxRT_LIBPATH.freebsd         = \
-	/usr/local/lib
 VBoxRT_LDFLAGS.darwin          = -framework IOKit -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxRT.dylib
 ifdef VBOX_USE_VCC80