diff --git a/lang/abcl/Makefile b/lang/abcl/Makefile
index 821f1c92c6f..398bbf58fe3 100644
--- a/lang/abcl/Makefile
+++ b/lang/abcl/Makefile
@@ -1,9 +1,8 @@
 COMMENT =		Common Lisp dialect for the Java Virtual Machine
-V =			1.8.0
+V =			1.9.0
 DISTNAME =		abcl-src-${V}
 PKGNAME =		abcl-${V}
 PKG_ARCH =		*
-REVISION =		0
 
 CATEGORIES =		lang
 
@@ -19,18 +18,25 @@ MASTER_SITES =		${HOMEPAGE}/releases/${V}/
 DISTFILES =		${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY =		${DISTNAME}${EXTRACT_SUFX}
 
+# Remember to keep MODJAVA_VER in sync with jna
 MODULES =		java
-MODJAVA_VER =		1.8+
+MODJAVA_VER =		11
 MODJAVA_BUILD =		ant
 MODJAVA_BUILD_TARGET_NAME =	abcl.jar
 
+BUILD_DEPENDS =		shells/bash
+
 RUN_DEPENDS =		java/javaPathHelper \
+			java/jna \
 			misc/rlwrap
 
 NO_TEST =		Yes
 
 ABCL_HOME =		${PREFIX}/abcl
 
+pre-configure:
+	bash ${WRKSRC}/ci/create-abcl-properties.bash ${MODJAVA_VER}
+
 do-install:
 	${INSTALL_DATA_DIR} ${ABCL_HOME}
 	${INSTALL_DATA} ${WRKSRC}/dist/abcl.jar ${ABCL_HOME}
diff --git a/lang/abcl/distinfo b/lang/abcl/distinfo
index 9dd1aa6f459..db6cfff0eed 100644
--- a/lang/abcl/distinfo
+++ b/lang/abcl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (abcl-src-1.8.0.tar.gz) = HYce4va8+ZHVpu/36lEF74CGENuIJgTU3wQR6XGtJX8=
-SIZE (abcl-src-1.8.0.tar.gz) = 2613411
+SHA256 (abcl-src-1.9.0.tar.gz) = oStchPKINL2Yjjra4K0q1MxsRR2eRPPAhT0AcVjBmGk=
+SIZE (abcl-src-1.9.0.tar.gz) = 2470791
diff --git a/lang/abcl/files/abcl_completions b/lang/abcl/files/abcl_completions
index a41cb1e432a..a0e14d55806 100644
--- a/lang/abcl/files/abcl_completions
+++ b/lang/abcl/files/abcl_completions
@@ -50,6 +50,7 @@ array-rank
 array-row-major-index
 array-total-size
 arrayp
+as-jar-pathname-archive
 ash
 asin
 asinh
@@ -128,7 +129,6 @@ cdddr
 cddr
 cdr
 ceiling
-cell-error-name
 cerror
 change-class
 char
@@ -284,7 +284,6 @@ ffloor
 fifth
 file-author
 file-directory-p
-file-error-pathname
 file-length
 file-namestring
 file-position
@@ -1816,7 +1815,6 @@ os-oldmac-p
 os-unix-p
 os-windows-p
 output-stream-p
-package-error-package
 package-local-nicknames
 package-locally-nicknamed-by-list
 package-name
@@ -2377,7 +2375,6 @@ system:case-body
 system:case-body-aux
 system:case-body-error
 system:casify
-system:cfp-output-file-default
 system:check-declaration-type
 system:check-disjoint
 system:check-for-circularity
@@ -2867,6 +2864,7 @@ system:read-evaluated-form
 system:read-feature
 system:read-list
 system:read-quote
+system:read-random-state
 system:read-right-paren
 system:read-string
 system:read-vector-unsigned-byte-8
@@ -3313,3 +3311,7 @@ xp:xp-structure-p
 y-or-n-p
 yes-or-no-p
 zerop
+-structure-p
+y-or-n-p
+yes-or-no-p
+zerop
diff --git a/lang/abcl/pkg/PLIST b/lang/abcl/pkg/PLIST
index 53f21721432..7c4bd0c1981 100644
--- a/lang/abcl/pkg/PLIST
+++ b/lang/abcl/pkg/PLIST
@@ -295,7 +295,6 @@ abcl/src/org/armedbear/lisp/fasl-concat.lisp
 abcl/src/org/armedbear/lisp/fdefinition.lisp
 abcl/src/org/armedbear/lisp/featurep.lisp
 abcl/src/org/armedbear/lisp/file_author.java
-abcl/src/org/armedbear/lisp/file_error_pathname.java
 abcl/src/org/armedbear/lisp/file_length.java
 abcl/src/org/armedbear/lisp/file_string_length.java
 abcl/src/org/armedbear/lisp/file_write_date.java
@@ -387,7 +386,6 @@ abcl/src/org/armedbear/lisp/open_stream_p.java
 abcl/src/org/armedbear/lisp/or.lisp
 abcl/src/org/armedbear/lisp/output_stream_p.java
 abcl/src/org/armedbear/lisp/package.lisp
-abcl/src/org/armedbear/lisp/package_error_package.java
 abcl/src/org/armedbear/lisp/parse-integer.lisp
 abcl/src/org/armedbear/lisp/parse-lambda-list.lisp
 abcl/src/org/armedbear/lisp/pathnames.lisp
@@ -487,4 +485,3 @@ abcl/src/org/armedbear/lisp/with-standard-io-syntax.lisp
 abcl/src/org/armedbear/lisp/write-sequence.lisp
 abcl/src/org/armedbear/lisp/zip.java
 bin/abcl
-share/doc/pkg-readmes/${PKGSTEM}
diff --git a/lang/abcl/pkg/README b/lang/abcl/pkg/README
deleted file mode 100644
index fec0ad5c724..00000000000
--- a/lang/abcl/pkg/README
+++ /dev/null
@@ -1,2 +0,0 @@
-In order to use CFFI to access foreign libraries the jna package needs
-to be installed.