diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c
index 73795df94..ec1e6a348 100644
--- a/src/inputPlugins/wavpack_plugin.c
+++ b/src/inputPlugins/wavpack_plugin.c
@@ -79,24 +79,41 @@ static void format_samples_int(int Bps, void *buffer, uint32_t samcnt)
 			break;
 		case 2:
 			while (samcnt--) {
-				*dst++ = (uchar)(temp = *src++);
+				temp = *src++;
+#ifdef WORDS_BIGENDIAN
 				*dst++ = (uchar)(temp >> 8);
+				*dst++ = (uchar)(temp); 
+#else
+				*dst++ = (uchar)(temp); 
+				*dst++ = (uchar)(temp >> 8);
+#endif
 			}
 			break;
 		case 3:
 			/* downscale to 16 bits */
 			while (samcnt--) {
 				temp = *src++;
+#ifdef WORDS_BIGENDIAN
+				*dst++ = (uchar)(temp >> 16);
+				*dst++ = (uchar)(temp >> 8);
+#else
 				*dst++ = (uchar)(temp >> 8);
 				*dst++ = (uchar)(temp >> 16);
+#endif
 			}
 			break;
 		case 4:
 			/* downscale to 16 bits */
 			while (samcnt--) {
 				temp = *src++;
+#ifdef WORDS_BIGENDIAN
+				*dst++ = (uchar)(temp >> 24);
+				*dst++ = (uchar)(temp >> 16);
+
+#else
 				*dst++ = (uchar)(temp >> 16);
 				*dst++ = (uchar)(temp >> 24);
+#endif
 			}
 			break;
 	}