diff -pruN dbus-1.5.2/bus/Makefile.am dbus-1.5.2-force-link-creation/bus/Makefile.am
--- dbus-1.5.2/bus/Makefile.am	2011-05-25 18:43:07.000000000 +0200
+++ dbus-1.5.2-force-link-creation/bus/Makefile.am	2011-06-02 23:40:45.987311079 +0200
@@ -204,12 +204,12 @@ install-data-hook:
 if HAVE_SYSTEMD
 # Install dbus.socket as default implementation of a D-Bus stack
 	$(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants
-	$(LN_S) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants/dbus.socket
+	$(LN_SF) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants/dbus.socket
 # Unconditionally enable D-Bus on systemd installations
 	$(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
-	$(LN_S) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/dbus.socket
+	$(LN_SF) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/dbus.socket
 	$(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants
-	$(LN_S) ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service
+	$(LN_SF) ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service
 endif
 
 if DBUS_UNIX
diff -pruN dbus-1.5.2/bus/Makefile.in dbus-1.5.2-force-link-creation/bus/Makefile.in
--- dbus-1.5.2/bus/Makefile.in	2011-06-01 13:19:36.000000000 +0200
+++ dbus-1.5.2-force-link-creation/bus/Makefile.in	2011-06-02 23:40:46.012311254 +0200
@@ -399,7 +399,7 @@ LIBTOOL = @LIBTOOL@
 LIBXML_CFLAGS = @LIBXML_CFLAGS@
 LIBXML_LIBS = @LIBXML_LIBS@
 LIPO = @LIPO@
-LN_S = @LN_S@
+LN_SF = @LN_SF@
 LTLIBOBJS = @LTLIBOBJS@
 LT_AGE = @LT_AGE@
 LT_CURRENT = @LT_CURRENT@
@@ -2583,12 +2583,12 @@ install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
 # Install dbus.socket as default implementation of a D-Bus stack
 @HAVE_SYSTEMD_TRUE@	$(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants
-@HAVE_SYSTEMD_TRUE@	$(LN_S) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants/dbus.socket
+@HAVE_SYSTEMD_TRUE@	$(LN_SF) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants/dbus.socket
 # Unconditionally enable D-Bus on systemd installations
 @HAVE_SYSTEMD_TRUE@	$(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
-@HAVE_SYSTEMD_TRUE@	$(LN_S) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/dbus.socket
+@HAVE_SYSTEMD_TRUE@	$(LN_SF) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/dbus.socket
 @HAVE_SYSTEMD_TRUE@	$(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants
-@HAVE_SYSTEMD_TRUE@	$(LN_S) ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service
+@HAVE_SYSTEMD_TRUE@	$(LN_SF) ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service
 
 @DBUS_UNIX_TRUE@install-exec-hook:
 @DBUS_UNIX_TRUE@	if test `id -u` -eq 0; then \
diff -pruN dbus-1.5.2/configure dbus-1.5.2-force-link-creation/configure
--- dbus-1.5.2/configure	2011-06-01 13:19:35.000000000 +0200
+++ dbus-1.5.2-force-link-creation/configure	2011-06-02 23:43:48.326587273 +0200
@@ -490,21 +490,23 @@ else
   mkdir conf$$.dir 2>/dev/null
 fi
 if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
+  if ln -sf conf$$.file conf$$ 2>/dev/null; then
+    as_ln_sf='ln -sf'
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
     # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+    ln -sf conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_sf='cp -p'
+  elif ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_sf='ln -s'
   elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
+    as_ln_sf=ln
   else
-    as_ln_s='cp -p'
+    as_ln_sf='cp -p'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_sf='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -745,7 +747,7 @@ ac_ct_AR
 AR
 DLLTOOL
 OBJDUMP
-LN_S
+LN_SF
 NM
 ac_ct_DUMPBIN
 DUMPBIN
@@ -6260,15 +6262,15 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
 $as_echo "$lt_cv_nm_interface" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -sf works" >&5
+$as_echo_n "checking whether ln -sf works... " >&6; }
+LN_SF=$as_ln_sf
+if test "$LN_SF" = "ln -sf"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_SF" >&5
+$as_echo "no, using $LN_SF" >&6; }
 fi
 
 # find the maximum length of command line arguments
@@ -8928,7 +8930,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
 
 
 
-test -z "$LN_S" && LN_S="ln -s"
+test -z "$LN_SF" && LN_SF="ln -sf"
 
 
 
@@ -11393,7 +11395,7 @@ amigaos*)
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_SF $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_SF $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -15244,7 +15246,7 @@ amigaos*)
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_SF $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_SF $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -21861,21 +21863,23 @@ else
   mkdir conf$$.dir 2>/dev/null
 fi
 if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
+  if ln -sf conf$$.file conf$$ 2>/dev/null; then
+    as_ln_sf='ln -sf'
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
     # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+    ln -sf conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_sf='cp -p'
+  elif ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_sf='ln -s'
   elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
+    as_ln_sf=ln
   else
-    as_ln_s='cp -p'
+    as_ln_sf='cp -p'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_sf='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -22193,7 +22197,7 @@ EGREP='`$ECHO "$EGREP" | $SED "$delay_si
 FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
 LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
 NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+LN_SF='`$ECHO "$LN_SF" | $SED "$delay_single_quote_subst"`'
 max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
 ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
 exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
@@ -22428,7 +22432,7 @@ EGREP \
 FGREP \
 LD \
 NM \
-LN_S \
+LN_SF \
 lt_SP2NL \
 lt_NL2SP \
 reload_flag \
@@ -23473,7 +23477,7 @@ FGREP=$lt_FGREP
 NM=$lt_NM
 
 # Whether we need soft or hard links.
-LN_S=$lt_LN_S
+LN_SF=$lt_LN_SF
 
 # What is the maximum length of a command?
 max_cmd_len=$max_cmd_len
diff -pruN dbus-1.5.2/dbus/Makefile.in dbus-1.5.2-force-link-creation/dbus/Makefile.in
--- dbus-1.5.2/dbus/Makefile.in	2011-06-01 13:19:36.000000000 +0200
+++ dbus-1.5.2-force-link-creation/dbus/Makefile.in	2011-06-02 23:40:45.911310547 +0200
@@ -435,7 +435,7 @@ LIBTOOL = @LIBTOOL@
 LIBXML_CFLAGS = @LIBXML_CFLAGS@
 LIBXML_LIBS = @LIBXML_LIBS@
 LIPO = @LIPO@
-LN_S = @LN_S@
+LN_SF = @LN_SF@
 LTLIBOBJS = @LTLIBOBJS@
 LT_AGE = @LT_AGE@
 LT_CURRENT = @LT_CURRENT@
diff -pruN dbus-1.5.2/doc/Makefile.in dbus-1.5.2-force-link-creation/doc/Makefile.in
--- dbus-1.5.2/doc/Makefile.in	2011-06-01 13:19:36.000000000 +0200
+++ dbus-1.5.2-force-link-creation/doc/Makefile.in	2011-06-02 23:40:46.373313781 +0200
@@ -177,7 +177,7 @@ LIBTOOL = @LIBTOOL@
 LIBXML_CFLAGS = @LIBXML_CFLAGS@
 LIBXML_LIBS = @LIBXML_LIBS@
 LIPO = @LIPO@
-LN_S = @LN_S@
+LN_SF = @LN_SF@
 LTLIBOBJS = @LTLIBOBJS@
 LT_AGE = @LT_AGE@
 LT_CURRENT = @LT_CURRENT@
diff -pruN dbus-1.5.2/m4/libtool.m4 dbus-1.5.2-force-link-creation/m4/libtool.m4
--- dbus-1.5.2/m4/libtool.m4	2011-06-01 13:10:16.000000000 +0200
+++ dbus-1.5.2-force-link-creation/m4/libtool.m4	2011-06-03 03:00:46.735932384 +0200
@@ -158,9 +158,9 @@ AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([LT_PATH_LD])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
 dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+AC_REQUIRE([AC_PROG_LN_SF])dnl
+test -z "$LN_SF" && LN_SF="ln -sf"
+_LT_DECL([], [LN_SF], [1], [Whether we need soft or hard links])dnl
 dnl
 AC_REQUIRE([LT_CMD_MAX_LEN])dnl
 _LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
@@ -2247,7 +2247,7 @@ amigaos*)
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_SF $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_SF $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
diff -pruN dbus-1.5.2/Makefile.in dbus-1.5.2-force-link-creation/Makefile.in
--- dbus-1.5.2/Makefile.in	2011-06-01 13:19:36.000000000 +0200
+++ dbus-1.5.2-force-link-creation/Makefile.in	2011-06-02 23:40:46.185312465 +0200
@@ -285,7 +285,7 @@ LIBTOOL = @LIBTOOL@
 LIBXML_CFLAGS = @LIBXML_CFLAGS@
 LIBXML_LIBS = @LIBXML_LIBS@
 LIPO = @LIPO@
-LN_S = @LN_S@
+LN_SF = @LN_SF@
 LTLIBOBJS = @LTLIBOBJS@
 LT_AGE = @LT_AGE@
 LT_CURRENT = @LT_CURRENT@
diff -pruN dbus-1.5.2/test/Makefile.in dbus-1.5.2-force-link-creation/test/Makefile.in
--- dbus-1.5.2/test/Makefile.in	2011-06-01 13:19:36.000000000 +0200
+++ dbus-1.5.2-force-link-creation/test/Makefile.in	2011-06-02 23:40:46.286313172 +0200
@@ -280,7 +280,7 @@ LIBTOOL = @LIBTOOL@
 LIBXML_CFLAGS = @LIBXML_CFLAGS@
 LIBXML_LIBS = @LIBXML_LIBS@
 LIPO = @LIPO@
-LN_S = @LN_S@
+LN_SF = @LN_SF@
 LTLIBOBJS = @LTLIBOBJS@
 LT_AGE = @LT_AGE@
 LT_CURRENT = @LT_CURRENT@
diff -pruN dbus-1.5.2/test/name-test/Makefile.in dbus-1.5.2-force-link-creation/test/name-test/Makefile.in
--- dbus-1.5.2/test/name-test/Makefile.in	2011-06-01 13:19:36.000000000 +0200
+++ dbus-1.5.2-force-link-creation/test/name-test/Makefile.in	2011-06-02 23:40:46.305313305 +0200
@@ -281,7 +281,7 @@ LIBTOOL = @LIBTOOL@
 LIBXML_CFLAGS = @LIBXML_CFLAGS@
 LIBXML_LIBS = @LIBXML_LIBS@
 LIPO = @LIPO@
-LN_S = @LN_S@
+LN_SF = @LN_SF@
 LTLIBOBJS = @LTLIBOBJS@
 LT_AGE = @LT_AGE@
 LT_CURRENT = @LT_CURRENT@
diff -pruN dbus-1.5.2/tools/Makefile.in dbus-1.5.2-force-link-creation/tools/Makefile.in
--- dbus-1.5.2/tools/Makefile.in	2011-06-01 13:19:36.000000000 +0200
+++ dbus-1.5.2-force-link-creation/tools/Makefile.in	2011-06-02 23:40:46.161312297 +0200
@@ -247,7 +247,7 @@ LIBTOOL = @LIBTOOL@
 LIBXML_CFLAGS = @LIBXML_CFLAGS@
 LIBXML_LIBS = @LIBXML_LIBS@
 LIPO = @LIPO@
-LN_S = @LN_S@
+LN_SF = @LN_SF@
 LTLIBOBJS = @LTLIBOBJS@
 LT_AGE = @LT_AGE@
 LT_CURRENT = @LT_CURRENT@