diff --git a/Makefile.in b/Makefile.in
index e97bf5aca..d1568022c 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -254,6 +254,7 @@ PL_SOURCES= \
 	$(srcdir)/pl/hacks.yap \
 	$(srcdir)/pl/init.yap \
 	$(srcdir)/pl/listing.yap \
+	$(srcdir)/pl/lists.yap \
 	$(srcdir)/pl/messages.yap \
 	$(srcdir)/pl/load_foreign.yap \
 	$(srcdir)/pl/modules.yap $(srcdir)/pl/preds.yap \
@@ -565,6 +566,7 @@ install_unix: startup.yss libYap.a
 	$(INSTALL) parms.h $(DESTDIR)$(INCLUDEDIR)/parms.h
 	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install)
 	@USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install)
+	@INSTALL_DLLS@ (cd packages/clib; $(MAKE) install)
 
 
 install_win32: startup.yss
diff --git a/configure b/configure
index b61352e13..c9cc40886 100755
--- a/configure
+++ b/configure
@@ -9052,7 +9052,12 @@ mkdir -p  library/yap2swi
 mkdir -p  LGPL/clp
 mkdir -p  LGPL/swi_console
 mkdir -p  GPL
-mkdir -p  packages/chr
+mkdir -p  packages/
+mkdir -p  packages/clib
+mkdir -p  packages/clib/sha1
+mkdir -p  packages/clib/maildrop
+mkdir -p  packages/clib/maildrop/rfc822
+mkdir -p  packages/clib/maildrop/rfc2045
 mkdir -p  packages/CLPBN
 mkdir -p  packages/clpqr
 mkdir -p  packages/cplint
@@ -9103,6 +9108,12 @@ ac_config_files="$ac_config_files LGPL/clp/Makefile"
 
 ac_config_files="$ac_config_files LGPL/swi_console/Makefile"
 
+ac_config_files="$ac_config_files packages/clib/Makefile"
+
+ac_config_files="$ac_config_files packages/clib/maildrop/rfc822/Makefile"
+
+ac_config_files="$ac_config_files packages/clib/maildrop/rfc2045/Makefile"
+
 ac_config_files="$ac_config_files packages/CLPBN/Makefile"
 
 ac_config_files="$ac_config_files packages/cplint/Makefile"
@@ -9846,6 +9857,9 @@ do
     "LGPL/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/Makefile" ;;
     "LGPL/clp/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/clp/Makefile" ;;
     "LGPL/swi_console/Makefile") CONFIG_FILES="$CONFIG_FILES LGPL/swi_console/Makefile" ;;
+    "packages/clib/Makefile") CONFIG_FILES="$CONFIG_FILES packages/clib/Makefile" ;;
+    "packages/clib/maildrop/rfc822/Makefile") CONFIG_FILES="$CONFIG_FILES packages/clib/maildrop/rfc822/Makefile" ;;
+    "packages/clib/maildrop/rfc2045/Makefile") CONFIG_FILES="$CONFIG_FILES packages/clib/maildrop/rfc2045/Makefile" ;;
     "packages/CLPBN/Makefile") CONFIG_FILES="$CONFIG_FILES packages/CLPBN/Makefile" ;;
     "packages/cplint/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/Makefile" ;;
     "packages/cplint/approx/simplecuddLPADs/Makefile") CONFIG_FILES="$CONFIG_FILES packages/cplint/approx/simplecuddLPADs/Makefile" ;;
diff --git a/configure.in b/configure.in
index 8fea97801..3e178ca31 100755
--- a/configure.in
+++ b/configure.in
@@ -1667,10 +1667,12 @@ mkdir -p  library/yap2swi
 mkdir -p  LGPL/clp
 mkdir -p  LGPL/swi_console
 mkdir -p  GPL
-mkdir -p  packages/chr
-dnl mkdir -p  packages/clib
-dnl mkdir -p  packages/clib/maildrop/rfc822
-dnl mkdir -p  packages/clib/maildrop/rfc2045
+mkdir -p  packages/
+mkdir -p  packages/clib
+mkdir -p  packages/clib/sha1
+mkdir -p  packages/clib/maildrop
+mkdir -p  packages/clib/maildrop/rfc822
+mkdir -p  packages/clib/maildrop/rfc2045
 mkdir -p  packages/CLPBN
 mkdir -p  packages/clpqr
 mkdir -p  packages/cplint
@@ -1705,9 +1707,9 @@ AC_CONFIG_FILES([library/yap2swi/Makefile])
 AC_CONFIG_FILES([LGPL/Makefile])
 AC_CONFIG_FILES([LGPL/clp/Makefile])
 AC_CONFIG_FILES([LGPL/swi_console/Makefile])
-dnl AC_CONFIG_FILES([packages/clib/Makefile])
-dnl AC_CONFIG_FILES([packages/clib/maildrop/rfc822/Makefile])
-dnl AC_CONFIG_FILES([packages/clib/maildrop/rfc2045/Makefile])
+AC_CONFIG_FILES([packages/clib/Makefile])
+AC_CONFIG_FILES([packages/clib/maildrop/rfc822/Makefile])
+AC_CONFIG_FILES([packages/clib/maildrop/rfc2045/Makefile])
 AC_CONFIG_FILES([packages/CLPBN/Makefile])
 AC_CONFIG_FILES([packages/cplint/Makefile])
 AC_CONFIG_FILES([packages/cplint/approx/simplecuddLPADs/Makefile])
diff --git a/packages/jpl b/packages/jpl
index daefe6058..1804608c8 160000
--- a/packages/jpl
+++ b/packages/jpl
@@ -1 +1 @@
-Subproject commit daefe60580876b2ab520e19d53bf085d2bb58552
+Subproject commit 1804608c80cbc053a3d7c5a6b70777b1e2f809b9