diff --git a/audio/gxmms2/Makefile b/audio/gxmms2/Makefile
index 57aff12b11a1..83538471f69f 100644
--- a/audio/gxmms2/Makefile
+++ b/audio/gxmms2/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	gxmms2
-PORTVERSION=	0.7.0
-PORTREVISION=	2
+PORTVERSION=	0.7.0.20090608
+DISTVERSIONSUFFIX=.795a77a
 CATEGORIES=	audio
-MASTER_SITES=	http://wejp.k.vu/projects/xmms2/
+#MASTER_SITES=	http://wejp.k.vu/projects/xmms2/
+MASTER_SITES=	ftp://ftp.lissyara.su/users/Guest/distfiles/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GTK2 based XMMS2 client, written in C
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libxmmsclient.so:${PORTSDIR}/audio/xmms2
+LIB_DEPENDS=	xmmsclient.5:${PORTSDIR}/audio/xmms2
 
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
diff --git a/audio/gxmms2/distinfo b/audio/gxmms2/distinfo
index ca43121a3f2b..22b8fcf50366 100644
--- a/audio/gxmms2/distinfo
+++ b/audio/gxmms2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gxmms2-0.7.0.tar.gz) = 5419a977d75e33f201fa63f5c5d196a6
-SHA256 (gxmms2-0.7.0.tar.gz) = 22b3186e625bce45a85f4f08004365944c4797ed6d0b6e2cf2111fcdde0eb5e3
-SIZE (gxmms2-0.7.0.tar.gz) = 75148
+MD5 (gxmms2-0.7.0.20090608.795a77a.tar.gz) = e3c8154035c69d5cae7d67f85f86d101
+SHA256 (gxmms2-0.7.0.20090608.795a77a.tar.gz) = aeedb2ae3ae7ca40dd1c718a3c52d92b2d0c52565b7c22e73be8ff36d04be3db
+SIZE (gxmms2-0.7.0.20090608.795a77a.tar.gz) = 75735
diff --git a/audio/gxmms2/files/patch-Makefile b/audio/gxmms2/files/patch-Makefile
index 3081fc48752b..567fa14bb64a 100644
--- a/audio/gxmms2/files/patch-Makefile
+++ b/audio/gxmms2/files/patch-Makefile
@@ -1,6 +1,6 @@
 --- Makefile.orig	Sun Mar  4 14:28:26 2007
 +++ Makefile	Sun Mar  4 14:30:42 2007
-@@ -1,22 +1,18 @@
+@@ -1,8 +1,6 @@
  # Makefile for gxmms2 and gkrellxmms2
  
  # Installation directory
@@ -9,23 +9,3 @@
  
  ALLFILES=gkrellxmms2/*.c gkrellxmms2/*.h gkrellxmms2/*.xpm gmedialib/*.c gmedialib/*.h gmedialib/*.xpm gtrackinfo/*.c gtrackinfo/*.h gxmms2src/*.c gxmms2src/*.h gxmms2src/*.xpm sdecode/*.c sdecode/*.h xmms2ctrl/*.c xmms2ctrl/*.h Makefile README COPYING CHANGELOG
  
--GTK_CFLAGS=$(shell pkg-config gtk+-2.0 --cflags)
--GTK_LIB=$(shell pkg-config gtk+-2.0 --libs)
--XMMS2_CFLAGS=$(shell pkg-config xmms2-client xmms2-client-glib --cflags)
--XMMS2_LIB=$(shell pkg-config xmms2-client xmms2-client-glib --libs)
-+GTK_CFLAGS=`pkg-config gtk+-2.0 --cflags`
-+GTK_LIB=`pkg-config gtk+-2.0 --libs`
-+XMMS2_CFLAGS=`pkg-config xmms2-client xmms2-client-glib --cflags`
-+XMMS2_LIB=`pkg-config xmms2-client xmms2-client-glib --libs`
- 
--CFLAGS=-O2 -Wall -fPIC $(GTK_CFLAGS) $(XMMS2_CFLAGS) -I.
--LIBS=$(GTK_LIB) $(XMMS2_LIB)
-+CFLAGS+=-O2 -Wall -fPIC $(GTK_CFLAGS) $(XMMS2_CFLAGS) -I.
-+LIBS+=$(GTK_LIB) $(XMMS2_LIB)
- 
- KRELLLFLAGS=-shared
--
--CC=gcc
- 
- OBJS=gxmms2src/gxmms2.o xmms2ctrl/xmms2ctrl.o gtrackinfo/trackinfo.o gtrackinfo/gtrackinfo.o gmedialib/gmlplaylist.o gmedialib/gmedialib.o gmedialib/gmlbrowser.o gmedialib/gmlsearch.o gmedialib/gmlplaylists.o gmedialib/gmladdfiles.o sdecode/sdecode.o gxmms2src/wejpscroller.o gxmms2src/statusdisplay.o gxmms2src/wejpvolume.o gxmms2src/wejpconfig.o gxmms2src/eggtrayicon.o
-