diff -u /usr/portage/app-arch/p7zip/metadata.xml ./metadata.xml
--- /usr/portage/app-arch/p7zip/metadata.xml	2016-01-31 13:30:31.000000000 +0300
+++ ./metadata.xml	2016-02-16 18:33:13.000000000 +0300
@@ -7,6 +7,7 @@
   </maintainer>
   <use>
     <flag name="rar">Enable support for non-free rar decoder</flag>
+    <flag name="natspec">Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">p7zip</remote-id>
diff -u /usr/portage/app-arch/p7zip/p7zip-15.09.ebuild ./p7zip-15.09.ebuild
--- /usr/portage/app-arch/p7zip/p7zip-15.09.ebuild	2015-10-30 19:45:00.000000000 +0300
+++ ./p7zip-15.09.ebuild	2016-02-16 18:34:53.000000000 +0300
@@ -15,12 +15,13 @@
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
+IUSE="doc kde rar +pch +natspec static wxwidgets abi_x86_x32"
 
 REQUIRED_USE="kde? ( wxwidgets )"
 
 RDEPEND="
 	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+	natspec? ( dev-libs/libnatspec )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
 DEPEND="${RDEPEND}
 	amd64? ( dev-lang/yasm )
@@ -32,6 +33,7 @@
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-CVE-2015-1038.patch
+	use natspec && epatch "${FILESDIR}"/${P}-natspec.patch
 
 	if ! use pch; then
 		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die