diff --git a/cyclone/Makefile b/cyclone/Makefile
index 02d72b585a..8698ca2e52 100644
--- a/cyclone/Makefile
+++ b/cyclone/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 GITHUB_PROJECT=	cyclone-bootstrap
-GITHUB_TAG=	v0.17
+GITHUB_TAG=	v0.18
 DISTNAME=	${GITHUB_TAG}
 PKGNAME=	cyclone-${DISTNAME:S,^v,,}
 CATEGORIES=	lang
diff --git a/cyclone/PLIST b/cyclone/PLIST
index 578a04329b..69731da98a 100644
--- a/cyclone/PLIST
+++ b/cyclone/PLIST
@@ -1,5 +1,6 @@
 @comment $NetBSD$
 bin/cyclone
+bin/cyclone-winds
 bin/icyc
 include/cyclone/bignum.h
 include/cyclone/ck_ht_hash.h
@@ -11,6 +12,10 @@ lib/libcyclone.a
 share/cyclone/cyclone/concurrent.o
 share/cyclone/cyclone/concurrent.sld
 share/cyclone/cyclone/concurrent.so
+share/cyclone/cyclone/foreign.meta
+share/cyclone/cyclone/foreign.o
+share/cyclone/cyclone/foreign.sld
+share/cyclone/cyclone/foreign.so
 share/cyclone/cyclone/match.meta
 share/cyclone/cyclone/match.o
 share/cyclone/cyclone/match.sld
@@ -35,11 +40,6 @@ share/cyclone/scheme/complex.so
 share/cyclone/scheme/cxr.o
 share/cyclone/scheme/cxr.sld
 share/cyclone/scheme/cxr.so
-share/cyclone/scheme/cyclone/array-list.meta
-share/cyclone/scheme/cyclone/array-list.o
-share/cyclone/scheme/cyclone/array-list.scm
-share/cyclone/scheme/cyclone/array-list.sld
-share/cyclone/scheme/cyclone/array-list.so
 share/cyclone/scheme/cyclone/ast.o
 share/cyclone/scheme/cyclone/ast.sld
 share/cyclone/scheme/cyclone/ast.so
diff --git a/cyclone/distinfo b/cyclone/distinfo
index 96d0b16aac..e5bd379831 100644
--- a/cyclone/distinfo
+++ b/cyclone/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-SHA1 (cyclone-bootstrap/v0.17.tar.gz) = aeb9d755cc4cd83e500b5cd29b18c56298c9233e
-RMD160 (cyclone-bootstrap/v0.17.tar.gz) = 502c75291513176bc5b809fc0c54cb4ceea39330
-SHA512 (cyclone-bootstrap/v0.17.tar.gz) = bbb521daa646a934e4f115edb7e16938c9a31787d240849547ab8ad5748b0c1d2af0999a1355f6e8d079e5990ae4a2faea361aaf946684b00540c79636dbc848
-Size (cyclone-bootstrap/v0.17.tar.gz) = 3113520 bytes
-SHA1 (patch-Makefile) = 161e365902752ed81c987e862f79a20915828965
+SHA1 (cyclone-bootstrap/v0.18.tar.gz) = 3134f7ab846316b5e671b7217bc7394f9f948d36
+RMD160 (cyclone-bootstrap/v0.18.tar.gz) = 36e74027001bb6fa24375311d757c249729debe9
+SHA512 (cyclone-bootstrap/v0.18.tar.gz) = b0e6c689a1dac191fe0fc5a68061736d2aea9925b93759d04884444acd319a674952beae7fcf5e7195dcdd27dcb32d0afc0d03477c4a15f4cb8a23b1a9c2c95b
+Size (cyclone-bootstrap/v0.18.tar.gz) = 3280822 bytes
+SHA1 (patch-Makefile) = f02f239e52224945d1bc02a94405373be5b427b6
 SHA1 (patch-Makefile.config) = b5f857305be64f8c05c04449bf5125746e44eb51
diff --git a/cyclone/patches/patch-Makefile b/cyclone/patches/patch-Makefile
index 74bf432e6e..d2ec2b7fa5 100644
--- a/cyclone/patches/patch-Makefile
+++ b/cyclone/patches/patch-Makefile
@@ -2,7 +2,7 @@ $NetBSD$
 
 Use pkgsrc libtommath (internally named libcyclonebn).
 
---- Makefile.orig	2020-02-10 21:34:59.000000000 +0000
+--- Makefile.orig	2020-06-08 22:26:41.000000000 +0000
 +++ Makefile
 @@ -8,8 +8,8 @@ include Makefile.config
  
@@ -26,7 +26,7 @@ Use pkgsrc libtommath (internally named libcyclonebn).
  
  cyclone: $(CFILES) $(COBJECTS) $(C_SHARED_OBJECTS) $(CYC_LIBS)
  	$(CC) cyclone.c $(CFLAGS) -c -o cyclone.o
-@@ -145,7 +145,7 @@ install:
+@@ -164,7 +164,7 @@ install:
  #install-libs:
  	$(MKDIR) $(DESTDIR)$(LIBDIR)
  	$(INSTALL) -m0644 $(CYC_RT_LIB) $(DESTDIR)$(LIBDIR)/
@@ -35,9 +35,9 @@ Use pkgsrc libtommath (internally named libcyclonebn).
  #install-cyclone:
  	$(MKDIR) $(DESTDIR)$(BINDIR)
  	$(MKDIR) $(DESTDIR)$(DATADIR)/scheme/cyclone
-@@ -169,7 +169,7 @@ install:
- 	$(INSTALL) -m0755 cyclone $(DESTDIR)$(BINDIR)/
+@@ -189,7 +189,7 @@ install:
  	$(INSTALL) -m0755 icyc $(DESTDIR)$(BINDIR)/
+ 	$(INSTALL) -m0755 cyclone-winds $(DESTDIR)$(BINDIR)/
  	$(INSTALL) -m0644 $(CYC_RT_LIB) $(DESTDIR)$(LIBDIR)/
 -	$(INSTALL) -m0644 $(CYC_BN_LIB) $(DESTDIR)$(LIBDIR)/
 +#	$(INSTALL) -m0644 $(CYC_BN_LIB) $(DESTDIR)$(LIBDIR)/