diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index e0e9b5a40fe6..d4afc7dfe5ee 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	liblastfm
 PORTVERSION=	0.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	swills
@@ -20,6 +20,7 @@ LIB_DEPENDS=	samplerate.1:${PORTSDIR}/audio/libsamplerate \
 		fftw3:${PORTSDIR}/math/fftw3 \
 		fftw3f:${PORTSDIR}/math/fftw3-float
 
+USE_CSTD=	gnu89
 USE_RUBY=	yes
 USE_GMAKE=	yes
 USE_QT4=	corelib xml network sql gui qtestlib \
diff --git a/audio/liblastfm/files/patch-src_fingerprint_fplib_FloatingAverage.h b/audio/liblastfm/files/patch-src_fingerprint_fplib_FloatingAverage.h
new file mode 100644
index 000000000000..1c7c8d49b49e
--- /dev/null
+++ b/audio/liblastfm/files/patch-src_fingerprint_fplib_FloatingAverage.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_fingerprint_fplib_FloatingAverage.h,v 1.1 2012/04/17 17:39:47 joerg Exp $
+
+--- src/fingerprint/fplib/FloatingAverage.h.orig	2012-04-17 15:10:50.000000000 +0000
++++ src/fingerprint/fplib/FloatingAverage.h
+@@ -76,7 +76,7 @@ public:
+    {
+       T real_sum = 0;
+       const T* pCircularBuffer = m_values.get_buffer();
+-      for ( int i = 0; i < size; ++i )
++      for ( int i = 0; i < size(); ++i )
+          real_sum += pCircularBuffer[i];
+       return abs(real_sum - m_sum) / this->size();
+    }