diff --git a/srcpkgs/es/patches/ldflags.patch b/srcpkgs/es/patches/ldflags.patch
new file mode 100644
index 00000000000..e7581786e9d
--- /dev/null
+++ b/srcpkgs/es/patches/ldflags.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -67,10 +67,10 @@
+ SIGFILES = @SIGFILES@
+ 
+ es	: ${OFILES} initial.o
+-	${CC} -o es ${LDFLAGS} ${OFILES} initial.o ${LIBS}
++	${CC} -o es ${OFILES} initial.o ${LDFLAGS} ${LIBS}
+ 
+ esdump	: ${OFILES} dump.o
+-	${CC} -o esdump ${LDFLAGS} ${OFILES} dump.o ${LIBS}
++	${CC} -o esdump ${OFILES} dump.o ${LDFLAGS} ${LIBS}
+ 
+ clean	:
+ 	rm -f es ${OFILES} ${GEN} dump.o initial.o
diff --git a/srcpkgs/es/template b/srcpkgs/es/template
index f591d6f5be1..608c411402f 100644
--- a/srcpkgs/es/template
+++ b/srcpkgs/es/template
@@ -1,30 +1,21 @@
 # Template file for 'es'
 pkgname=es
-version=0.9beta1
-revision=6
-wrksrc="${pkgname}-${version/beta/-beta}"
+version=0.9.2
+revision=1
+create_wrksrc=yes
 build_style=gnu-configure
-configure_args="--with-readline"
+configure_args="--with-readline es_cv_abused_getenv=no"
 hostmakedepends="bison"
 makedepends="readline-devel"
 short_desc="Functional shell with rc-inspired syntax"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
-homepage="http://hawkwind.cs.toronto.edu:8001/mlists/es.html"
-distfiles="ftp://ftp.sys.utoronto.ca/pub/${pkgname}/${pkgname}-${version/beta/-beta}.tar.gz"
-checksum=4085cd7a958fe8753abc026ed1450bd8fac4c70b753a650c5c3618bbe80d082b
+homepage="https://github.com/wryun/es-shell/"
+distfiles="https://github.com/wryun/es-shell/releases/download/v${version}/es-${version}.tar.gz"
+checksum=c926482b42084e903eb871ee1eb0cefc09dae6f1adeb8408dd9e933035c4f5dd
 nocross=yes
 register_shell="/bin/es"
 
-post_extract() {
-	sed -i '/_STDLIB_H/d' parse.y
-	sed -i 's/CLK_TCK/CLOCKS_PER_SEC/g' prim-sys.c
-	sed -i -e 's/va_arg(format->args, short)/va_arg(format->args, int)/' \
-		-e 's/format->args = saveargs/memcpy(format->args, saveargs, sizeof(va_list));/' print.c
-}
-
-do_install() {
-	vbin es
+post_install() {
 	vbin esdebug
-	vman es.1
 }