diff --git a/disabled-packages/picolisp/build.sh b/disabled-packages/picolisp/build.sh
index 526f05340..9601c75ac 100644
--- a/disabled-packages/picolisp/build.sh
+++ b/disabled-packages/picolisp/build.sh
@@ -4,11 +4,24 @@ TERMUX_PKG_VERSION=3.1.11
 TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp-${TERMUX_PKG_VERSION}.tgz
 TERMUX_PKG_FOLDERNAME=picoLisp
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_MAKE_PROCESSES=1
-# TERMUX_PKG_DEPENDS="pcre, openssl, libuuid"
-#TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ssl=openssl"
 
-termux_step_post_extract_package () {
+termux_step_pre_configure() {
 	TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src
-	CFLAGS+=" $LDFLAGS $CPPFLAGS"
+	TERMUX_PKG_BUILDDIR=$TERMUX_PKG_SRCDIR
+	CFLAGS+=" -c $LDFLAGS $CPPFLAGS"
+}
+
+termux_step_make_install () {
+	cp $TERMUX_PKG_SRCDIR/../man/man1/{pil,picolisp}.1 $TERMUX_PREFIX/share/man/man1/
+
+	rm -Rf $TERMUX_PREFIX/lib/picolisp
+	mkdir -p $TERMUX_PREFIX/lib/picolisp
+
+	cp -Rf $TERMUX_PKG_SRCDIR/../* $TERMUX_PREFIX/lib/picolisp/
+	rm -Rf $TERMUX_PREFIX/lib/picolisp/{src,src64,man,java,ersatz}
+
+	# Replace first line "#!/usr/bin/picolisp /usr/lib/picolisp/lib.l":
+	sed -i "1 s|^.*$|#!$TERMUX_PREFIX/bin/picolisp $TERMUX_PREFIX/lib/picolisp/lib.l|g" $TERMUX_PREFIX/lib/picolisp/bin/pil
+
+	( cd $TERMUX_PREFIX/bin && ln -f -s ../lib/picolisp/bin/picolisp picolisp && ln -f -s ../lib/picolisp/bin/pil pil )
 }
diff --git a/disabled-packages/picolisp/lib-debug.l.patch b/disabled-packages/picolisp/lib-debug.l.patch
new file mode 100644
index 000000000..43ce73c70
--- /dev/null
+++ b/disabled-packages/picolisp/lib-debug.l.patch
@@ -0,0 +1,12 @@
+diff -u -r ../picoLisp/lib/debug.l ./lib/debug.l
+--- ../picoLisp/lib/debug.l	2015-04-03 03:09:48.000000000 -0400
++++ ./lib/debug.l	2015-10-01 18:39:47.475128813 -0400
+@@ -8,7 +8,7 @@
+ 
+ # Browsing
+ (de doc (Sym Browser)
+-   (call (or Browser (sys "BROWSER") 'w3m)
++   (call (or Browser (sys "BROWSER") 'lynx)
+       (pack
+          "file:"
+          (and (= `(char '/) (char (path "@"))) "//")
diff --git a/disabled-packages/picolisp/src-Makefile.patch b/disabled-packages/picolisp/src-Makefile.patch
index 4ae52458b..ac3a148f0 100644
--- a/disabled-packages/picolisp/src-Makefile.patch
+++ b/disabled-packages/picolisp/src-Makefile.patch
@@ -1,6 +1,6 @@
-diff -u -r ../picoLisp/src/Makefile ./Makefile
+diff -u -r ../picoLisp/src/Makefile ./src/Makefile
 --- ../picoLisp/src/Makefile	2015-03-31 14:48:22.000000000 -0400
-+++ ./Makefile	2015-09-24 05:23:56.372236679 -0400
++++ ./src/Makefile	2015-09-24 05:23:56.372236679 -0400
 @@ -6,111 +6,13 @@
  
  picoFiles = main.c gc.c apply.c flow.c sym.c subr.c big.c io.c net.c tab.c
@@ -111,10 +111,10 @@ diff -u -r ../picoLisp/src/Makefile ./Makefile
 -endif
 +CCLD = $(CC)
  
-+LCRYPT = -lcrypt
++LCRYPT = 
 +OS = Android
-+PICOLISP-FLAGS = -rdynamic
-+DYNAMIC-LIB-FLAGS = -shared -export-dynamic
++PICOLISP-FLAGS = -rdynamic -lm $(LDFLAGS)
++DYNAMIC-LIB-FLAGS = -shared -export-dynamic $(LDFLAGS)
  
  picolisp: $(bin)/picolisp $(lib)/ext$(dll) $(lib)/ht$(dll)
  tools: $(bin)/lat1 $(bin)/utf2 $(bin)/balance