diff --git a/audio/musepack/Makefile b/audio/musepack/Makefile
index 7bce87be48b..6a85acd27e0 100644
--- a/audio/musepack/Makefile
+++ b/audio/musepack/Makefile
@@ -3,7 +3,7 @@ COMMENT =		decoder, encoder and replaygain for musepack files
 V =			475
 DISTNAME =		musepack_src_r${V}
 PKGNAME =		musepack-${V}
-REVISION =		6
+REVISION =		7
 CATEGORIES =		audio
 
 HOMEPAGE =		https://www.musepack.net/
diff --git a/audio/musepack/patches/patch-libmpcpsy_libmpcpsy_h b/audio/musepack/patches/patch-libmpcpsy_libmpcpsy_h
new file mode 100644
index 00000000000..ee608725e86
--- /dev/null
+++ b/audio/musepack/patches/patch-libmpcpsy_libmpcpsy_h
@@ -0,0 +1,14 @@
+Index: libmpcpsy/libmpcpsy.h
+--- libmpcpsy/libmpcpsy.h.orig
++++ libmpcpsy/libmpcpsy.h
+@@ -86,8 +86,8 @@ typedef struct {
+ 	float KBD2; // = -1.
+ 
+ 	// FIXME : remove this :
+-	int * SCF_Index_L;
+-	int * SCF_Index_R;              // Scalefactor-index for Bitstream
++	int (* SCF_Index_L)[3];
++	int (* SCF_Index_R)[3];         // Scalefactor-index for Bitstream
+ 
+ } PsyModel;
+ 
diff --git a/audio/musepack/patches/patch-mpcenc_mpcenc_c b/audio/musepack/patches/patch-mpcenc_mpcenc_c
new file mode 100644
index 00000000000..55d8cf10d74
--- /dev/null
+++ b/audio/musepack/patches/patch-mpcenc_mpcenc_c
@@ -0,0 +1,14 @@
+Index: mpcenc/mpcenc.c
+--- mpcenc/mpcenc.c.orig
++++ mpcenc/mpcenc.c
+@@ -1535,8 +1535,8 @@ mainloop ( int argc, char** argv )
+ 
+     // initialize tables which must be initialized once and only once
+ 
+-	m.SCF_Index_L = (int*) e.SCF_Index_L;
+-	m.SCF_Index_R = (int*) e.SCF_Index_R;
++	m.SCF_Index_L = e.SCF_Index_L;
++	m.SCF_Index_R = e.SCF_Index_R;
+ 
+ 	Init_Psychoakustik (&m);
+ 	Init_FPU ();
diff --git a/audio/musepack/patches/patch-mpcenc_mpcenc_h b/audio/musepack/patches/patch-mpcenc_mpcenc_h
new file mode 100644
index 00000000000..3611303a32c
--- /dev/null
+++ b/audio/musepack/patches/patch-mpcenc_mpcenc_h
@@ -0,0 +1,14 @@
+Index: mpcenc/mpcenc.h
+--- mpcenc/mpcenc.h.orig
++++ mpcenc/mpcenc.h
+@@ -254,8 +254,8 @@ extern float __invSCF [128 + 6];        // tabulated s
+ 
+ float  ISNR_Schaetzer                  ( const float* samples, const float comp, const int res);
+ float  ISNR_Schaetzer_Trans            ( const float* samples, const float comp, const int res);
+-void   QuantizeSubband                 ( unsigned int* qu_output, const float* input, const int res, float* errors, const int maxNsOrder );
+-void   QuantizeSubbandWithNoiseShaping ( unsigned int* qu_output, const float* input, const int res, float* errors, const float* FIR );
++void   QuantizeSubband                 ( mpc_int16_t* qu_output, const float* input, const int res, float* errors, const int maxNsOrder );
++void   QuantizeSubbandWithNoiseShaping ( mpc_int16_t* qu_output, const float* input, const int res, float* errors, const float* FIR );
+ 
+ void   NoiseInjectionComp ( void );
+