diff --git a/media-sound/shntool/Manifest b/media-sound/shntool/Manifest
new file mode 100644
index 0000000000000000000000000000000000000000..925b98cd52c3a74c5ed8b8be6492762399312508
--- /dev/null
+++ b/media-sound/shntool/Manifest
@@ -0,0 +1,4 @@
+AUX shntool-3.0.10-large-size.patch 877 SHA256 605f2030112e1ed6b68001d97a2ea839b00328995bbd795850fb2595f5797c68 SHA512 b94241c8d82aa598671d93aa47d8644b37d59fbe9f276a652710d6b0404e7280b8d68c1ac0df2ef559e76066b3c0d27370c6ab9f424cfc6189a7a88dd9b5a9e4 WHIRLPOOL 20558b2dd19f9c1063ec47496135dadf183f70756d6540c846d01ee9a8540779fe5fd1872a53aed119c03b0ce70b6701b1bb80ac782093f56c6417393dc81a7b
+AUX shntool-3.0.10-large-times.patch 1207 SHA256 418f9cc575e9d9964ee85819b5db7b38108d2b19a32459ad5e9b5c19d5296292 SHA512 6349b06af11707b4263f48efed3293670eba2136fd8da050e7fcb203d1fb02e508c07b0fcc398fc1988a0255ed067487cb9a72d6753e42034b34598ec085b1f8 WHIRLPOOL e0c44d5595a29a1fb9efaec09c4d2a38f425041df33b5f405b9b8087c856c2959b5711fd88385b0936c28087a4d966184e3272ed7f26ac72bc01f950a212b245
+DIST shntool-3.0.10.tar.gz 216061 SHA256 74302eac477ca08fb2b42b9f154cc870593aec8beab308676e4373a5e4ca2102 SHA512 2150d7123860abb54a56a1615bda991ed3713d73c338723f28b7d01a63c49a47809be16dc57b5b4edeee1567b003f9a4b54945c1cd08440f9503d22b91eaa06d WHIRLPOOL fb7c11c99482e043da2827ab682aadde4b7309d5e0739a176589de2ac8db0af01d62826eb8d8c6451c2c72876078f4147fa8712ce41acff785ac495350d17322
+EBUILD shntool-3.0.10-r2.ebuild 986 SHA256 18b7f0de25b2a74f072ea0f0e53464e6850bc2b685750ffecf48efe4da6666b6 SHA512 c1aba9719004a0b7104a8c17a9ffbbdc5c729ff2a214cd8c9c5ae349f6d5283e7bbafbc7586e918e1969446120a54f1f77962ed2630979ff4cea9bc1c45f42d1 WHIRLPOOL 627b3ed929ceb4109b17ef9098869415f8d77166692842652521651e6912557f0f74d6a796ea7579a4aa985cf7c67b0871dc5be3bff476305b45f9151eb4da17
diff --git a/media-sound/shntool/files/shntool-3.0.10-large-size.patch b/media-sound/shntool/files/shntool-3.0.10-large-size.patch
new file mode 100644
index 0000000000000000000000000000000000000000..539c7fb7059548119fa2f48c98a4b61b92f5ccc7
--- /dev/null
+++ b/media-sound/shntool/files/shntool-3.0.10-large-size.patch
@@ -0,0 +1,22 @@
+diff -aur shntool-3.0.10-clean/src/core_fileio.c shntool-3.0.10-size/src/core_fileio.c
+--- shntool-3.0.10-clean/src/core_fileio.c	2009-03-11 17:18:01.000000000 +0000
++++ shntool-3.0.10-size/src/core_fileio.c	2012-08-11 17:20:14.000000000 +0100
+@@ -110,10 +110,16 @@
+   buf[4] = 0;
+ 
+   if (be_val)
+-    *be_val = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
++    *be_val = (((unsigned long)buf[0]) << 24)
++              | (((unsigned long)buf[1]) << 16)
++              | (((unsigned long)buf[2]) << 8)
++              | ((unsigned long)buf[3]);
+ 
+   if (le_val)
+-    *le_val = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
++    *le_val = (((unsigned long)buf[3]) << 24)
++              | (((unsigned long)buf[2]) << 16)
++              | (((unsigned long)buf[1]) << 8)
++              | ((unsigned long)buf[0]);
+ 
+   if (tag_val)
+     tagcpy(tag_val,buf);
diff --git a/media-sound/shntool/files/shntool-3.0.10-large-times.patch b/media-sound/shntool/files/shntool-3.0.10-large-times.patch
new file mode 100644
index 0000000000000000000000000000000000000000..be4716e6b62b044cf47e8d8d724b13184adce86e
--- /dev/null
+++ b/media-sound/shntool/files/shntool-3.0.10-large-times.patch
@@ -0,0 +1,39 @@
+diff -aur shntool-3.0.10-clean/src/core_mode.c shntool-3.0.10/src/core_mode.c
+--- shntool-3.0.10-clean/src/core_mode.c	2009-03-30 06:55:33.000000000 +0100
++++ shntool-3.0.10/src/core_mode.c	2012-08-11 16:37:58.000000000 +0100
+@@ -310,8 +310,8 @@
+   if (sec >= 60)
+     st_error("invalid value for seconds: [%d]",sec);
+ 
+-  bytes = (wlong)(min * info->rate * 60) +
+-          (wlong)(sec * info->rate);
++  bytes = (((wlong)min) * info->rate * 60) +
++          (((wlong)sec) * info->rate);
+ 
+   return bytes;
+ }
+@@ -358,9 +358,9 @@
+   if (frames >= 75)
+     st_error("invalid value for frames: [%d]",frames);
+ 
+-  bytes = (wlong)(min * CD_RATE * 60) +
+-          (wlong)(sec * CD_RATE) +
+-          (wlong)(frames * CD_BLOCK_SIZE);
++  bytes = (((wlong)min) * CD_RATE * 60) +
++          (((wlong)sec) * CD_RATE) +
++          (((wlong)frames) * CD_BLOCK_SIZE);
+ 
+   return bytes;
+ }
+@@ -403,8 +403,8 @@
+ 
+   nearest_byte = (int)((((double)ms * (double)info->rate) / 1000.0) + 0.5);
+ 
+-  bytes = (wlong)(min * info->rate * 60) +
+-          (wlong)(sec * info->rate);
++  bytes = (((wlong)min) * info->rate * 60) +
++          (((wlong)sec) * info->rate);
+ 
+   if (PROB_NOT_CD(info)) {
+     bytes += nearest_byte;
+
diff --git a/media-sound/shntool/shntool-3.0.10-r2.ebuild b/media-sound/shntool/shntool-3.0.10-r2.ebuild
new file mode 100644
index 0000000000000000000000000000000000000000..ecad5d33a3d87772869243da1317bca49e024e44
--- /dev/null
+++ b/media-sound/shntool/shntool-3.0.10-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shntool/shntool-3.0.10-r1.ebuild,v 1.6 2012/05/14 10:31:31 radhermit Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="A multi-purpose WAVE data processing and reporting utility"
+HOMEPAGE="http://www.etree.org/shnutils/shntool/"
+SRC_URI="http://www.etree.org/shnutils/shntool/dist/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="alac flac mac shorten sox wavpack"
+
+RDEPEND="flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	sox? ( media-sound/sox )
+	alac? ( media-sound/alac_decoder )
+	shorten? ( media-sound/shorten )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}"
+
+DOCS="NEWS README ChangeLog AUTHORS doc/*"
+
+src_prepare() {
+    unpack ${A}
+    cd "${S}"
+    epatch "${FILESDIR}/${P}-large-size.patch"
+    epatch "${FILESDIR}/${P}-large-times.patch"
+}
+