diff --git a/packages/addons/shell/texteditor/nano/addon b/packages/addons/shell/texteditor/nano/addon
index f8c68ddcaa..460c468328 100755
--- a/packages/addons/shell/texteditor/nano/addon
+++ b/packages/addons/shell/texteditor/nano/addon
@@ -23,4 +23,8 @@
 . config/options $1
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/src/nano $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/src/nano $ADDON_BUILD/$PKG_ADDON_ID/bin/nano.bin
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $BUILD/ncurses-[0-9]*/lib/libtinfo.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp $BUILD/ncurses-[0-9]*/lib/libncurses.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
diff --git a/packages/addons/shell/texteditor/nano/build b/packages/addons/shell/texteditor/nano/build
index ea9022a29b..d39a87f2f0 100755
--- a/packages/addons/shell/texteditor/nano/build
+++ b/packages/addons/shell/texteditor/nano/build
@@ -25,8 +25,6 @@
 # nano fails to build with GOLD linker
   strip_gold
 
-LDFLAGS="$LDFLAGS -static"
-
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
diff --git a/packages/addons/shell/texteditor/nano/changelog.txt b/packages/addons/shell/texteditor/nano/changelog.txt
index b58f592898..9776725a9c 100644
--- a/packages/addons/shell/texteditor/nano/changelog.txt
+++ b/packages/addons/shell/texteditor/nano/changelog.txt
@@ -1,3 +1,7 @@
+0.99.3
+- build as shared lib
+- include ncurses libs
+
 0.99.2
 - prepare for release
 
diff --git a/packages/addons/shell/texteditor/nano/meta b/packages/addons/shell/texteditor/nano/meta
index b21e811c0d..5f28e32fc3 100644
--- a/packages/addons/shell/texteditor/nano/meta
+++ b/packages/addons/shell/texteditor/nano/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="nano"
 PKG_VERSION="2.3.0"
-PKG_REV="2"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.nano-editor.org/"
diff --git a/packages/addons/shell/texteditor/nano/source/bin/nano b/packages/addons/shell/texteditor/nano/source/bin/nano
new file mode 100755
index 0000000000..8e3fdf4cb4
--- /dev/null
+++ b/packages/addons/shell/texteditor/nano/source/bin/nano
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+ADDON_DIR="$HOME/.xbmc/addons/shell.texteditor.nano"
+
+chmod +x $ADDON_DIR/lib/*
+
+LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" nano.bin $@