diff --git a/games-strategy/tornado/files/tornado-1.4-r1-gentoo.patch b/games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch
similarity index 100%
rename from games-strategy/tornado/files/tornado-1.4-r1-gentoo.patch
rename to games-strategy/tornado/files/tornado-1.4-r2-gentoo.patch
diff --git a/games-strategy/tornado/tornado-1.4-r1.ebuild b/games-strategy/tornado/tornado-1.4-r2.ebuild
similarity index 73%
rename from games-strategy/tornado/tornado-1.4-r1.ebuild
rename to games-strategy/tornado/tornado-1.4-r2.ebuild
index 1cdb04da4b13a..c2a5f7c2f76c2 100644
--- a/games-strategy/tornado/tornado-1.4-r1.ebuild
+++ b/games-strategy/tornado/tornado-1.4-r2.ebuild
@@ -11,13 +11,14 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="nls"
 
 DEPEND="
-	sys-devel/gettext
+	nls? ( sys-devel/gettext )
 "
 
 RDEPEND="
-	virtual/libintl
+	nls? ( virtual/libintl )
 "
 
 PATCHES=(
@@ -25,6 +26,13 @@ PATCHES=(
 )
 
 src_configure() {
+	if ! use nls; then
+		sed -i \
+			-e '/^all:/s|locales||g' \
+			-e '/^install:/s|install-locale-data||g' \
+			Makefile || die
+	fi
+
 	tc-export CC PKG_CONFIG
 }