diff --git a/usr/portage/app-editors/nano/nano-2.3.1-r2.ebuild b/app-editors/nano/nano-2.3.1-r2.ebuild
index abc28b3..22f2c03 100644
--- a/usr/portage/app-editors/nano/nano-2.3.1-r2.ebuild
+++ b/app-editors/nano/nano-2.3.1-r2.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.1-r2.ebuild,v 1.10 2013/02/21 05:32:41 zmedico Exp $
 
-EAPI="3"
+EAPI="5"
 
-inherit eutils autotools
+inherit eutils autotools flag-o-matic
 if [[ ${PV} == "9999" ]] ; then
 	ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
 	inherit subversion autotools
@@ -19,9 +19,11 @@ HOMEPAGE="http://www.nano-editor.org/ http://www.gentoo.org/doc/en/nano-basics-g
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug justify +magic minimal ncurses nls slang spell unicode"
+IUSE="debug justify +magic minimal ncurses nls slang spell unicode -static"
 
+REQUIRED_USE="static? ( !magic )"
 RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
+        static? ( >=sys-libs/ncurses-5.9-r1[static-libs] )
 	magic? ( sys-apps/file )
 	nls? ( virtual/libintl )
 	!ncurses? ( slang? ( sys-libs/slang ) )"
@@ -39,6 +41,7 @@ src_prepare() {
 
 src_configure() {
 	eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic)
+	use static && append-ldflags -static
 	econf \
 		--bindir="${EPREFIX}"/bin \
 		$(use_enable !minimal color) \