diff -urN audio/pianobar/Makefile audio/pianobar/Makefile
--- audio/pianobar/Makefile	2012-01-11 21:43:46.000000000 -0800
+++ audio/pianobar/Makefile	2012-05-12 19:37:15.000000000 -0700
@@ -6,19 +6,21 @@
 #
 
 PORTNAME=	pianobar
-PORTVERSION=	2012.01.10
+PORTVERSION=	2012.05.06
 CATEGORIES=	audio
-MASTER_SITES=	http://6xq.net/static/projects/${PORTNAME}/
+MASTER_SITES=	http://6xq.net/projects/${PORTNAME}/
 
 MAINTAINER=	john@pcbsd.org
 COMMENT=	Command line Pandora player
 
-LICENSE=	MIT
-
 LIB_DEPENDS=	ao:${PORTSDIR}/audio/libao \
 		faad:${PORTSDIR}/audio/faad \
 		mad:${PORTSDIR}/audio/libmad \
-		gnutls.47:${PORTSDIR}/security/gnutls
+		gnutls.47:${PORTSDIR}/security/gnutls \
+		json.0:${PORTSDIR}/devel/json-c \
+		gcrypt:${PORTSDIR}/security/libgcrypt
+
+LICENSE=	MIT
 
 MAN1=		pianobar.1
 MAN_COMPRESSED=	no
diff -urN audio/pianobar/distinfo audio/pianobar/distinfo
--- audio/pianobar/distinfo	2012-01-11 21:43:46.000000000 -0800
+++ audio/pianobar/distinfo	2012-05-12 19:37:24.000000000 -0700
@@ -1,2 +1,2 @@
-SHA256 (pianobar-2012.01.10.tar.bz2) = 6d19e5abde542bcdf8b9cfa50448fbe95c1e113f59e54065c9f4e0fbf78690f9
-SIZE (pianobar-2012.01.10.tar.bz2) = 68839
+SHA256 (pianobar-2012.05.06.tar.bz2) = b143882ca50303d560f49567d1a508ca4b48208db4eb8aa67f369fcaae708d7a
+SIZE (pianobar-2012.05.06.tar.bz2) = 47052
diff -urN audio/pianobar/files/patch-crypt.c audio/pianobar/files/patch-crypt.c
--- audio/pianobar/files/patch-crypt.c	1969-12-31 16:00:00.000000000 -0800
+++ audio/pianobar/files/patch-crypt.c	2012-05-12 19:46:05.000000000 -0700
@@ -0,0 +1,10 @@
+--- src/libpiano/crypt.c.orig	2012-05-06 07:33:54.000000000 -0700
++++ src/libpiano/crypt.c	2012-05-12 19:42:13.000000000 -0700
+@@ -23,6 +23,7 @@
+ 
+ #include <string.h>
+ #include <assert.h>
++#define _GCRYPT_IN_LIBGCRYPT
+ #include <gcrypt.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff -urN audio/pianobar/files/patch-crypt.h audio/pianobar/files/patch-crypt.h
--- audio/pianobar/files/patch-crypt.h	1969-12-31 16:00:00.000000000 -0800
+++ audio/pianobar/files/patch-crypt.h	2012-05-12 19:46:34.000000000 -0700
@@ -0,0 +1,10 @@
+--- src/libpiano/crypt.h.orig	2012-05-06 07:33:54.000000000 -0700
++++ src/libpiano/crypt.h	2012-05-12 19:42:29.000000000 -0700
+@@ -24,6 +24,7 @@
+ #ifndef _CRYPH_H
+ #define _CRYPT_H
+ 
++#define _GCRYPT_IN_LIBGCRYPT
+ #include <gcrypt.h>
+ 
+ char *PianoDecryptString (gcry_cipher_hd_t, const char * const,
diff -urN audio/pianobar/files/patch-piano.h audio/pianobar/files/patch-piano.h
--- audio/pianobar/files/patch-piano.h	1969-12-31 16:00:00.000000000 -0800
+++ audio/pianobar/files/patch-piano.h	2012-05-12 19:47:02.000000000 -0700
@@ -0,0 +1,10 @@
+--- src/libpiano/piano.h.orig	2012-05-06 07:33:54.000000000 -0700
++++ src/libpiano/piano.h	2012-05-12 19:42:41.000000000 -0700
+@@ -25,6 +25,7 @@
+ #define _PIANO_H
+ 
+ #include <stdbool.h>
++#define _GCRYPT_IN_LIBGCRYPT
+ #include <gcrypt.h>
+ 
+ /* this is our public API; don't expect this api to be stable as long as