--- src/support/shobj-conf~	2009-01-05 06:32:42.000000000 +1100
+++ src/support/shobj-conf	2009-10-28 20:14:23.602957984 +1100
@@ -127,8 +127,8 @@
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
 	;;
 
-# FreeBSD-3.x ELF
-freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*)
+# FreeBSD-3.x aout/ELF selectable
+freebsd3*|freebsdaout*)
 	SHOBJ_CFLAGS=-fPIC
 	SHOBJ_LD='${CC}'
 
@@ -145,6 +145,16 @@
 	fi
 	;;
 
+# FreeBSD ELF
+freebsd[4-9]*|freebsdelf*|dragonfly*)
+	SHOBJ_CFLAGS=-fPIC
+	SHOBJ_LD='${CC}'
+	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+
+	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir)'
+	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
+	;;
+
 # Darwin/MacOS X
 darwin[89]*|darwin10*)
 	SHOBJ_STATUS=supported
--- src/support/shlib-install~	2008-07-20 09:16:05.000000000 +1000
+++ src/support/shlib-install	2009-10-28 20:14:23.571956653 +1100
@@ -153,8 +153,8 @@
 	;;
 
 
-# FreeBSD 3.x and above can have either a.out or ELF shared libraries
-freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*)
+# FreeBSD 3.x can have either a.out or ELF shared libraries
+freebsd3*|freebsdaout*)
 	if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
 		# libname.so -> libname.so.M
 		${echo} ${RM} ${INSTALLDIR}/$LINK1
@@ -176,6 +176,15 @@
 	fi
 	;;
 
+# FreeBSD 4.x and above uses ELF shared libraries
+freebsd[4-9]*|freebsdelf*|dragonfly*)
+	# libname.so -> libname.so.M
+	${echo} ${RM} ${INSTALLDIR}/$LINK1
+	if [ -z "$uninstall" ]; then
+		eval $INSTALL_LINK1
+	fi
+	;;
+
 hpux1*)
 	# libname.sl -> libname.M
 	${echo} ${RM} ${INSTALLDIR}/$LINK1.sl