diff --git a/packages/tools/nano/install b/packages/addons/shell/texteditor/nano/addon
similarity index 91%
rename from packages/tools/nano/install
rename to packages/addons/shell/texteditor/nano/addon
index 9fce2acdf8..f8c68ddcaa 100755
--- a/packages/tools/nano/install
+++ b/packages/addons/shell/texteditor/nano/addon
@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/src/nano $INSTALL/usr/bin
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/src/nano $ADDON_BUILD/$PKG_ADDON_ID/bin
diff --git a/packages/tools/nano/build b/packages/addons/shell/texteditor/nano/build
similarity index 97%
rename from packages/tools/nano/build
rename to packages/addons/shell/texteditor/nano/build
index d39a87f2f0..ea9022a29b 100755
--- a/packages/tools/nano/build
+++ b/packages/addons/shell/texteditor/nano/build
@@ -25,6 +25,8 @@
 # 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
new file mode 100644
index 0000000000..b58f592898
--- /dev/null
+++ b/packages/addons/shell/texteditor/nano/changelog.txt
@@ -0,0 +1,5 @@
+0.99.2
+- prepare for release
+
+0.99.1
+- initial addon based on nano-2.3.0
diff --git a/packages/addons/shell/texteditor/nano/icon/icon.png b/packages/addons/shell/texteditor/nano/icon/icon.png
new file mode 100644
index 0000000000..70c6da0693
Binary files /dev/null and b/packages/addons/shell/texteditor/nano/icon/icon.png differ
diff --git a/packages/tools/nano/meta b/packages/addons/shell/texteditor/nano/meta
similarity index 93%
rename from packages/tools/nano/meta
rename to packages/addons/shell/texteditor/nano/meta
index e2ac257fea..b21e811c0d 100644
--- a/packages/tools/nano/meta
+++ b/packages/addons/shell/texteditor/nano/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="nano"
 PKG_VERSION="2.3.0"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.nano-editor.org/"
@@ -28,9 +28,11 @@ PKG_URL="http://ftp.gnu.org/gnu/nano/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="ncurses"
 PKG_BUILD_DEPENDS="toolchain ncurses"
 PKG_PRIORITY="optional"
-PKG_SECTION="tools"
+PKG_SECTION="shell/texteditor"
 PKG_SHORTDESC="nano: Pico editor clone with enhancements"
 PKG_LONGDESC="GNU nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone of the Pico text editor."
-PKG_IS_ADDON="no"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="yes"
diff --git a/packages/addons/shell/texteditor/nano/source/default.py b/packages/addons/shell/texteditor/nano/source/default.py
new file mode 100644
index 0000000000..2085a1f96d
--- /dev/null
+++ b/packages/addons/shell/texteditor/nano/source/default.py
@@ -0,0 +1,23 @@
+################################################################################
+#      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
+################################################################################
+
+import os
+import sys
+import xbmcaddon