diff --git a/packages/addons/shell/texteditor/nano/changelog.txt b/packages/addons/shell/texteditor/nano/changelog.txt
deleted file mode 100644
index 1834b2696c..0000000000
--- a/packages/addons/shell/texteditor/nano/changelog.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-3.0.1
-- bump addon version
-
-2.1.2
-- cleanup
-
-2.1.1
-- update to addon version 2.1
-
-2.0.0
-- prepare for OpenELEC-2.0 release
-
-1.90.1
-- depends on xbmc.python API 2.0
-
-1.90.0
-- prepare for OpenELEC-1.90 release
-
-1.0.0
-- update to nano-2.3.1
-- prepare for OpenELEC-1.0 release
-
-0.99.4
-- change icon
-
-0.99.3
-- build as shared lib
-- include ncurses libs
-
-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
deleted file mode 100644
index 84cfefded5..0000000000
Binary files a/packages/addons/shell/texteditor/nano/icon/icon.png and /dev/null differ
diff --git a/packages/addons/shell/texteditor/nano/build b/packages/shell/texteditor/nano/build
similarity index 100%
rename from packages/addons/shell/texteditor/nano/build
rename to packages/shell/texteditor/nano/build
diff --git a/packages/addons/shell/texteditor/nano/addon b/packages/shell/texteditor/nano/install
similarity index 91%
rename from packages/addons/shell/texteditor/nano/addon
rename to packages/shell/texteditor/nano/install
index 0a5f1fc693..d35348a0dd 100755
--- a/packages/addons/shell/texteditor/nano/addon
+++ b/packages/shell/texteditor/nano/install
@@ -22,5 +22,6 @@
 
 . config/options $1
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/src/nano $ADDON_BUILD/$PKG_ADDON_ID/bin
+
+mkdir -p $INSTALL/usr/bin
+  cp $PKG_BUILD/src/nano $INSTALL/usr/bin
diff --git a/packages/addons/shell/texteditor/nano/meta b/packages/shell/texteditor/nano/meta
similarity index 96%
rename from packages/addons/shell/texteditor/nano/meta
rename to packages/shell/texteditor/nano/meta
index 31f406ae76..bce92a348e 100644
--- a/packages/addons/shell/texteditor/nano/meta
+++ b/packages/shell/texteditor/nano/meta
@@ -32,7 +32,5 @@ 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="yes"
-PKG_ADDON_TYPE="xbmc.python.script"
-
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
diff --git a/packages/addons/shell/texteditor/nano/source/default.py b/packages/shell/texteditor/nano/profile.d/nano.conf
similarity index 79%
rename from packages/addons/shell/texteditor/nano/source/default.py
rename to packages/shell/texteditor/nano/profile.d/nano.conf
index 8d4c5e9e96..8d9262bce3 100644
--- a/packages/addons/shell/texteditor/nano/source/default.py
+++ b/packages/shell/texteditor/nano/profile.d/nano.conf
@@ -17,7 +17,10 @@
 #  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
+# Core (EDITOR) environment variable.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
 
-import os
-import sys
-import xbmcaddon
+export EDITOR="nano"
diff --git a/projects/ATV/options b/projects/ATV/options
index b544ea619d..defd4d1ef6 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -327,6 +327,9 @@
 # OEM packages for OEM's (yes / no)
   OEM_SUPPORT="no"
 
+# build and install nano text editor (yes / no)
+  NANO_EDITOR="yes"
+
 # Coreboot support (yes / no)
   COREBOOT="no"
 
diff --git a/projects/Fusion/options b/projects/Fusion/options
index 00a188d25b..c8e6438fb9 100755
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -326,6 +326,9 @@
 # OEM packages for OEM's (yes / no)
   OEM_SUPPORT="no"
 
+# build and install nano text editor (yes / no)
+  NANO_EDITOR="yes"
+
 # Coreboot support (yes / no)
   COREBOOT="no"
 
diff --git a/projects/Generic/options b/projects/Generic/options
index 71a0d6e8a9..c8485db8a8 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -326,6 +326,9 @@
 # OEM packages for OEM's (yes / no)
   OEM_SUPPORT="no"
 
+# build and install nano text editor (yes / no)
+  NANO_EDITOR="yes"
+
 # Coreboot support (yes / no)
   COREBOOT="no"
 
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index d6fb78b838..a33339f4fc 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -326,6 +326,9 @@
 # OEM packages for OEM's (yes / no)
   OEM_SUPPORT="no"
 
+# build and install nano text editor (yes / no)
+  NANO_EDITOR="yes"
+
 # Coreboot support (yes / no)
   COREBOOT="no"
 
diff --git a/projects/ION/options b/projects/ION/options
index ec08935ee8..e98fcb3151 100755
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -326,6 +326,9 @@
 # OEM packages for OEM's (yes / no)
   OEM_SUPPORT="no"
 
+# build and install nano text editor (yes / no)
+  NANO_EDITOR="yes"
+
 # Coreboot support (yes / no)
   COREBOOT="no"
 
diff --git a/projects/Intel/options b/projects/Intel/options
index c7bbb49e8c..6df76b5a8d 100755
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -326,6 +326,9 @@
 # OEM packages for OEM's (yes / no)
   OEM_SUPPORT="no"
 
+# build and install nano text editor (yes / no)
+  NANO_EDITOR="yes"
+
 # Coreboot support (yes / no)
   COREBOOT="no"
 
diff --git a/projects/RPi/options b/projects/RPi/options
index 570a89d588..30bbec3559 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -326,6 +326,9 @@
 # OEM packages for OEM's (yes / no)
   OEM_SUPPORT="no"
 
+# build and install nano text editor (yes / no)
+  NANO_EDITOR="yes"
+
 # Coreboot support (yes / no)
   COREBOOT="no"
 
diff --git a/projects/Ultra/options b/projects/Ultra/options
index 1b3d95f45c..9b56844c06 100755
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@@ -326,6 +326,9 @@
 # OEM packages for OEM's (yes / no)
   OEM_SUPPORT="no"
 
+# build and install nano text editor (yes / no)
+  NANO_EDITOR="yes"
+
 # Coreboot support (yes / no)
   COREBOOT="no"
 
diff --git a/projects/Virtual/options b/projects/Virtual/options
index 0e1bbe6937..f94a18ba91 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -321,6 +321,9 @@
 # OEM packages for OEM's (yes / no)
   OEM_SUPPORT="no"
 
+# build and install nano text editor (yes / no)
+  NANO_EDITOR="yes"
+
 # Coreboot support (yes / no)
   COREBOOT="no"
 
diff --git a/scripts/image b/scripts/image
index dd46401e7a..96266e3d02 100755
--- a/scripts/image
+++ b/scripts/image
@@ -148,6 +148,9 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
 # OEM packages
   [ "$OEM_SUPPORT" = "yes" ] && $SCRIPTS/install oem
 
+# nano text editor
+  [ "$NANO_EDITOR" = "yes" ] && $SCRIPTS/install nano
+
 # copy project related files to filesystem
   if [ -d "$PROJECT_DIR/$PROJECT/filesystem" ]; then
     cp -PR $PROJECT_DIR/$PROJECT/filesystem/* $INSTALL