diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index 0b1275363949..71d98ba673f5 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -22,17 +22,13 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_AUTOCONF_VER=	213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" 
+		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-alsa
 
 CFLAGS+=	-fPIC
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 503000
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 .if ${OSVERSION} > 500013 || ${MACHINE_ARCH} == "alpha"
 USE_GNOME+=	esound
 CONFIGURE_ARGS+=	--disable-oss --enable-esd
diff --git a/audio/xmp/files/patch-configure.in b/audio/xmp/files/patch-configure.in
index 783105abe24f..067941bacf68 100644
--- a/audio/xmp/files/patch-configure.in
+++ b/audio/xmp/files/patch-configure.in
@@ -1,5 +1,5 @@
 --- configure.in.orig	Sat Jan 20 02:06:28 2001
-+++ configure.in	Sun Apr  8 11:32:48 2001
++++ configure.in	Sun Nov 21 15:34:41 2004
 @@ -142,7 +142,7 @@
      sys/soundcard.h machine/soundcard.h \
      sys/ultrasound.h linux/ultrasound.h machine/ultrasound.h \
@@ -9,7 +9,7 @@
  
  dnl -----------------------------------------------------------------------
  dnl Check OS/architecture independent drivers
-@@ -173,15 +173,10 @@
+@@ -173,15 +173,13 @@
      fi])
  fi
  
@@ -24,6 +24,9 @@
 -    fi])
 +if test "$enable_esd" = yes; then
 +    AC_CHECK_LIB(esd, esd_play_stream)
++    if test "${enable_dynamic}" != "yes"; then
++	LIBS="${LIBS} ${LDFLAGS} -lesd"
++    fi
 +    DRIVERS="${DRIVERS} esd.o"
 +    AC_DEFINE(DRIVER_ESD)
  fi