diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index ae18d1d1120e..8606b7f80b17 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	glame
-PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTVERSION=	0.5.4
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,13 +16,15 @@ MAINTAINER=	sobomax@FreeBSD.org
 USE_GNOME=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \
 		 s|-lpthread|${PTHREAD_LIBS}|g'
diff --git a/audio/glame/distinfo b/audio/glame/distinfo
index 50e69af14c40..87188b6d7749 100644
--- a/audio/glame/distinfo
+++ b/audio/glame/distinfo
@@ -1 +1 @@
-MD5 (glame-0.2.0.tar.gz) = 4f76ec8fae2cac761dae2cf8b58f6c7e
+MD5 (glame-0.5.4.tar.gz) = 7c7a05c6d2d342218beee0a9c2d2640e
diff --git a/audio/glame/files/patch-aa b/audio/glame/files/patch-aa
deleted file mode 100644
index 15716c14d48f..000000000000
--- a/audio/glame/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/include/sem.h	2000/09/26 17:00:35	1.1
-+++ src/include/sem.h	2000/09/26 17:01:08
-@@ -35,7 +35,7 @@
- #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
- /* union semun is defined by including <sys/sem.h> */
- #else
--#if !defined(_NO_XOPEN4)
-+#if !defined(_NO_XOPEN4) && !defined(__FreeBSD__)
- /* according to X/OPEN we have to define it ourselves */
- union semun {
- 	int val;                    /* value for SETVAL */
diff --git a/audio/glame/files/patch-ltmain.sh b/audio/glame/files/patch-ltmain.sh
new file mode 100644
index 000000000000..e60fec5e37db
--- /dev/null
+++ b/audio/glame/files/patch-ltmain.sh
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- ltmain.sh.orig	Mon Dec 10 12:53:39 2001
++++ ltmain.sh	Thu Dec 20 17:29:14 2001
+@@ -1052,7 +1052,7 @@
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd[234]*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2359,6 +2359,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=""
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+@@ -4247,10 +4250,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/audio/glame/pkg-plist b/audio/glame/pkg-plist
index 73fab29ac34d..056fed3ffa2b 100644
--- a/audio/glame/pkg-plist
+++ b/audio/glame/pkg-plist
@@ -1,52 +1,96 @@
 bin/cglame
 bin/glame
-bin/gmkswap
-@unexec install-info --delete %D/info/glame.info %D/info/dir
+bin/glame-convert.sh
+info/glame-dev.info
+info/glame-dev.info-1
+info/glame-dev.info-2
+info/glame-dev.info-3
 info/glame.info
 info/glame.info-1
 info/glame.info-2
-info/glame.info-3
-@exec install-info --section="Audio Processing" --entry="* glame: (glame).           audio processing tool for GNOME" %D/info/glame.info %D/info/dir
+lib/glame/arithmetic.a
+lib/glame/arithmetic.so
+lib/glame/audio_io_esd.a
+lib/glame/audio_io_esd.so
+lib/glame/audio_io_oss.a
+lib/glame/audio_io_oss.so
 lib/glame/debug.a
 lib/glame/debug.so
-lib/glame/debug.so.0
+lib/glame/distortion.a
+lib/glame/distortion.so
 lib/glame/echo.a
 lib/glame/echo.so
-lib/glame/echo.so.0
-lib/glame/garrison.a
-lib/glame/garrison.so
-lib/glame/garrison.so.0
+lib/glame/fader.a
+lib/glame/fader.so
+lib/glame/flanger.a
+lib/glame/flanger.so
 lib/glame/iir.a
 lib/glame/iir.so
-lib/glame/iir.so.0
-lib/glame/maggy.a
-lib/glame/maggy.so
-lib/glame/maggy.so.0
 lib/glame/noisegate.a
 lib/glame/noisegate.so
-lib/glame/noisegate.so.0
-lib/glame/nold.a
-lib/glame/nold.so
-lib/glame/nold.so.0
+lib/glame/normalize.a
+lib/glame/normalize.so
 lib/glame/pan.a
 lib/glame/pan.so
-lib/glame/pan.so.0
 lib/glame/pipe.a
 lib/glame/pipe.so
-lib/glame/pipe.so.0
+lib/glame/ssp.a
+lib/glame/ssp.so
 lib/glame/tutorial.a
 lib/glame/tutorial.so
-lib/glame/tutorial.so.0
-lib/libglame.a
-lib/libglame.so
-lib/libglame.so.0
-lib/libglamebuiltins.a
-lib/libglamebuiltins.so
-lib/libglamebuiltins.so.0
-share/gnome/glame/default.png
-share/gnome/glame/glame-logo.jpg
-share/gnome/glame/glame.scm
-share/gnome/glame/mix1.png
-share/gnome/glame/mix2.png
+lib/glame/waveform.a
+lib/glame/waveform.so
+share/gnome/apps/Multimedia/glame.desktop
+share/gnome/glame/default-accels
+share/gnome/glame/pixmaps/bandpass.png
+share/gnome/glame/pixmaps/const.png
+share/gnome/glame/pixmaps/default.png
+share/gnome/glame/pixmaps/delay.png
+share/gnome/glame/pixmaps/distortion.png
+share/gnome/glame/pixmaps/dots.png
+share/gnome/glame/pixmaps/drop.png
+share/gnome/glame/pixmaps/dup.png
+share/gnome/glame/pixmaps/echo.png
+share/gnome/glame/pixmaps/equalizer.png
+share/gnome/glame/pixmaps/extend.png
+share/gnome/glame/pixmaps/fade.png
+share/gnome/glame/pixmaps/fft.png
+share/gnome/glame/pixmaps/flanger.png
+share/gnome/glame/pixmaps/glame-logo.jpg
+share/gnome/glame/pixmaps/iir.png
+share/gnome/glame/pixmaps/input.png
+share/gnome/glame/pixmaps/invert.png
+share/gnome/glame/pixmaps/mix1.png
+share/gnome/glame/pixmaps/noisegate.png
+share/gnome/glame/pixmaps/null.png
+share/gnome/glame/pixmaps/one2n.png
+share/gnome/glame/pixmaps/output.png
+share/gnome/glame/pixmaps/pan.png
+share/gnome/glame/pixmaps/ping.png
+share/gnome/glame/pixmaps/pipe.png
+share/gnome/glame/pixmaps/play.png
+share/gnome/glame/pixmaps/prod.png
+share/gnome/glame/pixmaps/pulse.png
+share/gnome/glame/pixmaps/rect.png
+share/gnome/glame/pixmaps/repeat.png
+share/gnome/glame/pixmaps/resample.png
+share/gnome/glame/pixmaps/save.png
+share/gnome/glame/pixmaps/select_all.png
+share/gnome/glame/pixmaps/select_none.png
+share/gnome/glame/pixmaps/sine.png
+share/gnome/glame/pixmaps/statistics.png
+share/gnome/glame/pixmaps/sum.png
+share/gnome/glame/pixmaps/volume_adjust.png
+share/gnome/glame/pixmaps/zoom_in.png
+share/gnome/glame/pixmaps/zoom_out.png
+share/gnome/glame/scripts/bassboost.scm
+share/gnome/glame/scripts/echo2.scm
+share/gnome/glame/scripts/glame.scm
+share/gnome/glame/scripts/read_mp3.scm
+share/gnome/glame/scripts/resample.scm
+share/locale/de/LC_MESSAGES/glame.mo
+share/locale/fr/LC_MESSAGES/glame.mo
+@dirrm share/gnome/glame/scripts
+@dirrm share/gnome/glame/pixmaps
 @dirrm share/gnome/glame
 @dirrm lib/glame