diff --git a/utils/joe/Makefile b/utils/joe/Makefile
index 66843072e..bc6ad2f64 100644
--- a/utils/joe/Makefile
+++ b/utils/joe/Makefile
@@ -5,10 +5,9 @@
 # See /LICENSE for more information.
 #
 
-# changes by David Kuehling <dvdkhlng TA gmx TOD de>:
+# changes by Vitaly Prosko <villy TA sft TOD ru>:
 #
-#  - include support for all emulation modes jmacs jpico etc.
-#  - see patches/002-builtinrc.patch
+#  - added new package joe-extra with all additional joe's stuff
 #
 # changes by Vitaly Prosko <villy TA sft TOD ru>:
 #
@@ -21,7 +20,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=joe
 PKG_VERSION:=4.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/joe-editor
@@ -42,11 +41,24 @@ define Package/joe
   DEPENDS:=+libncurses
 endef
 
+define Package/joe-extras
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Editors
+  TITLE:=Extra data for JOE - Joes own editor
+  URL:=https://sourceforge.net/projects/joe-editor/
+  DEPENDS:=+joe
+endef
+
 define Package/joe/description
 Joe is world-famous Wordstar like text editor, that also features
 Emacs and Pico emulation
 endef
 
+define Package/joe-extras/description
+Additional data for full Joe editor functionality
+endef
+
 define Package/joe/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/joe/joe $(1)/usr/bin/
@@ -54,8 +66,28 @@ define Package/joe/install
 	$(INSTALL_CONF) ./files/joerc $(1)/etc/joe/joerc
 endef
 
+define Package/joe-extras/install
+	$(INSTALL_DIR) $(1)/etc/joe
+	$(INSTALL_DIR) $(1)/usr/share/joe/{syntax,lang,charmaps,colors}
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/rc/{ftype,jicerc.ru,jmacsrc,jpicorc,jstarrc,rjoerc} $(1)/etc/joe/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/syntax/*.jsf $(1)/usr/share/joe/syntax/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/po/*.po $(1)/usr/share/joe/lang/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/charmaps/klingon $(1)/usr/share/joe/charmaps/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/colors/*.jcf $(1)/usr/share/joe/colors/
+endef
+
 define Package/joe/conffiles
 /etc/joe/joerc
 endef
 
+define Package/joe-extras/conffiles
+/etc/joe/ftype
+/etc/joe/jicerc.ru
+/etc/joe/jmacsrc
+/etc/joe/jpicorc
+/etc/joe/jstarrc
+/etc/joe/rjoerc
+endef
+
 $(eval $(call BuildPackage,joe))
+$(eval $(call BuildPackage,joe-extras))