diff --git a/audio/xmms-speex/files/patch-Makefile b/audio/xmms-speex/files/patch-Makefile
index 056a63e7edb1..a4dfbb940d79 100644
--- a/audio/xmms-speex/files/patch-Makefile
+++ b/audio/xmms-speex/files/patch-Makefile
@@ -1,14 +1,25 @@
 
 $FreeBSD$
 
---- Makefile.orig	Sun Aug  3 18:18:42 2003
-+++ Makefile	Thu Aug 14 18:08:45 2003
-@@ -14,7 +14,7 @@
+--- Makefile.orig	Sun Feb 25 13:19:50 2007
++++ Makefile	Sun Feb 25 15:51:05 2007
+@@ -2,7 +2,9 @@
+ VERSION=\"0.9.1\"
+ PACKAGE=\"libspeex\"
+ 
+-INCDIRS=`xmms-config --cflags`
++SPEEX_INCLUDE=$(shell pkg-config --cflags speex)
++SPEEX_LIB=$(shell pkg-config --libs speex)
++INCDIRS=$(shell xmms-config --cflags) $(SPEEX_INCLUDE)
+ CFLAGS = -Wall
+ OBJS = http.o config.o fileinfo.o speexutil.o # utf8.o
+ GUIOBJS = gui/interface.o gui/support.o gui/callbacks.o
+@@ -14,7 +16,7 @@
  	$(MAKE) -C $(@D) all
  
  libspeex.so: libspeex.c libspeex.h $(OBJS) $(GUIOBJS)
 -	$(CC) -shared -logg -lspeex -lgtk -lpthread -lxmms $(INCDIRS) $(CFLAGS) -DVERSION=$(VERSION) -DPACKAGE=\"libspeex\" -o libspeex.so libspeex.c $(OBJS) $(GUIOBJS)
-+	$(CC) -shared $(INCDIRS) $(CFLAGS) -DVERSION=$(VERSION) -DPACKAGE=\"libspeex\" -o libspeex.so libspeex.c $(OBJS) $(GUIOBJS) `xmms-config --libs` -logg -lspeex
++	$(CC) -shared $(INCDIRS) $(CFLAGS) -DVERSION=$(VERSION) -DPACKAGE=\"libspeex\" -o libspeex.so libspeex.c $(OBJS) $(GUIOBJS) $(shell xmms-config --libs) -logg $(SPEEX_LIB)
  
  #utf8.o: utf8.c utf8.h
  #	$(CC) -c $(INCDIRS) $(CFLAGS) -DHAVE_ICONV -DICONV_CONST= -o utf8.o utf8.c