diff --git a/utils/joe/Makefile b/utils/joe/Makefile
index 3019d34d1..3ca592cfb 100644
--- a/utils/joe/Makefile
+++ b/utils/joe/Makefile
@@ -20,12 +20,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=joe
-PKG_VERSION:=3.7
-PKG_RELEASE:=3
+PKG_VERSION:=4.0
+PKG_RELEASE:=4
 
 PKG_SOURCE_URL:=@SF/joe-editor
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=66de1b073e869ba12abbfcde3885c577
+PKG_MD5SUM:=3c3b6d5089a29ddc746ee89bab59286e
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_MAINTAINER:=Vitaly Protsko <villy@sft.ru>
 PKG_LICENCE:=GPL-1.0
@@ -48,7 +48,7 @@ endef
 
 define Package/joe/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/joe $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/joe/joe $(1)/usr/bin/
 	for i in jmacs jstar rjoe jpico; do \
 	  ln -sf joe $(1)/usr/bin/$$$$i; \
 	done
diff --git a/utils/joe/files/joerc b/utils/joe/files/joerc
index 24def75a1..2c42beebd 100644
--- a/utils/joe/files/joerc
+++ b/utils/joe/files/joerc
@@ -619,3 +619,31 @@ type		^@ TO 
 
 :querysr		Search & replace query window
 type		^@ TO ÿ
+
+:shell			Input to shell windows
+:inherit main
+""		^C		Abort
+""		^D		Eof
+"	"	^I		Tab
+""		^H		Backspace
+"
"		^M		Return
+""		^?		Backspace
+
+:vtshell		Input to ANSI shell windows
+:inherit main
+""		 [ A
+""		.ku
+""		 [ B
+""		.kd
+""		 [ C
+""		.kr
+""		 [ D
+""		.kl
+"
"		^A		BOL for bash
+""		^C		Abort
+""		^D		Eof
+""		^E		EOL for bash
+"	"	^I		Tab
+""		^H		Backspace
+"
"		^M		Return
+""		^?		Backspace
diff --git a/utils/joe/patches/001-mathaway.patch b/utils/joe/patches/001-mathaway.patch
deleted file mode 100644
index 99fc93007..000000000
--- a/utils/joe/patches/001-mathaway.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/umath.c
-+++ b/umath.c
-@@ -378,7 +378,6 @@ double m_cos(double n) { return cos(n); 
- double m_tan(double n) { return tan(n); }
- double m_exp(double n) { return exp(n); }
- double m_sqrt(double n) { return sqrt(n); }
--double m_cbrt(double n) { return cbrt(n); }
- double m_log(double n) { return log(n); }
- double m_log10(double n) { return log10(n); }
- double m_asin(double n) { return asin(n); }
-@@ -387,19 +386,10 @@ double m_atan(double n) { return atan(n)
- double m_sinh(double n) { return sinh(n); }
- double m_cosh(double n) { return cosh(n); }
- double m_tanh(double n) { return tanh(n); }
--double m_asinh(double n) { return asinh(n); }
--double m_acosh(double n) { return acosh(n); }
--double m_atanh(double n) { return atanh(n); }
- double m_int(double n) { return (int)(n); }
- double m_floor(double n) { return floor(n); }
- double m_ceil(double n) { return ceil(n); }
- double m_fabs(double n) { return fabs(n); }
--double m_erf(double n) { return erf(n); }
--double m_erfc(double n) { return erfc(n); }
--double m_j0(double n) { return j0(n); }
--double m_j1(double n) { return j1(n); }
--double m_y0(double n) { return y0(n); }
--double m_y1(double n) { return y1(n); }
- 
- double calc(BW *bw, unsigned char *s)
- {
-@@ -414,7 +404,6 @@ double calc(BW *bw, unsigned char *s)
- 		v = get(USTR "tan"); v->func = m_tan;
- 		v = get(USTR "exp"); v->func = m_exp;
- 		v = get(USTR "sqrt"); v->func = m_sqrt;
--		v = get(USTR "cbrt"); v->func = m_cbrt;
- 		v = get(USTR "ln"); v->func = m_log;
- 		v = get(USTR "log"); v->func = m_log10;
- 		v = get(USTR "asin"); v->func = m_asin;
-@@ -425,19 +414,10 @@ double calc(BW *bw, unsigned char *s)
- 		v = get(USTR "sinh"); v->func = m_sinh;
- 		v = get(USTR "cosh"); v->func = m_cosh;
- 		v = get(USTR "tanh"); v->func = m_tanh;
--		v = get(USTR "asinh"); v->func = m_asinh;
--		v = get(USTR "acosh"); v->func = m_acosh;
--		v = get(USTR "atanh"); v->func = m_atanh;
- 		v = get(USTR "int"); v->func = m_int;
- 		v = get(USTR "floor"); v->func = m_floor;
- 		v = get(USTR "ceil"); v->func = m_ceil;
- 		v = get(USTR "abs"); v->func = m_fabs;
--		v = get(USTR "erf"); v->func = m_erf;
--		v = get(USTR "erfc"); v->func = m_erfc;
--		v = get(USTR "j0"); v->func = m_j0;
--		v = get(USTR "j1"); v->func = m_j1;
--		v = get(USTR "y0"); v->func = m_y0;
--		v = get(USTR "y1"); v->func = m_y1;
- 	}
- 
- 	v = get(USTR "top");