diff --git a/devel/slib/Makefile b/devel/slib/Makefile
index 8d62bb15928..c74b9cbbac1 100644
--- a/devel/slib/Makefile
+++ b/devel/slib/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2004/09/14 23:34:18 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2005/10/30 09:27:08 espie Exp $
 
 COMMENT=	"scheme r5 library"
 
 CATEGORIES=	devel
 
-V=3a1
+V=3a2
 DISTNAME=	slib$V
 PKGNAME=	slib-$V
 EXTRACT_SUFX=	.zip
diff --git a/devel/slib/distinfo b/devel/slib/distinfo
index f24e549cb87..605d98af62c 100644
--- a/devel/slib/distinfo
+++ b/devel/slib/distinfo
@@ -1,4 +1,4 @@
-MD5 (slib3a1.zip) = a8805700c4c49d48a14fc8a0c2b996f4
-RMD160 (slib3a1.zip) = 9058c89d0da0231bdf06be084e316fb73f456f28
-SHA1 (slib3a1.zip) = 8cedb61df26094060bd2f691ded7d03004238e06
-SIZE (slib3a1.zip) = 861953
+MD5 (slib3a2.zip) = 1e3a119031411105c47c02c9cc8450dc
+RMD160 (slib3a2.zip) = 4080e2a8f57a2a4188bce27d19331054876d9bd9
+SHA1 (slib3a2.zip) = a6650b72db700a7fdef621446283d171ca9406ea
+SIZE (slib3a2.zip) = 961683
diff --git a/devel/slib/pkg/PLIST b/devel/slib/pkg/PLIST
index bab662b1a6c..ebbe31eff13 100644
--- a/devel/slib/pkg/PLIST
+++ b/devel/slib/pkg/PLIST
@@ -1,21 +1,27 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/14 23:34:18 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2005/10/30 09:27:09 espie Exp $
 @info info/slib.info
 share/slib/
 share/slib/ANNOUNCE
 share/slib/Bev2slib.scm
+share/slib/DrScheme.init
 share/slib/FAQ
 share/slib/README
+share/slib/RScheme.init
+share/slib/STk.init
 share/slib/Template.scm
 share/slib/alist.scm
 share/slib/alistab.scm
 share/slib/array.scm
 share/slib/arraymap.scm
 share/slib/batch.scm
+share/slib/bigloo.init
 share/slib/break.scm
 share/slib/byte.scm
 share/slib/bytenumb.scm
 share/slib/chap.scm
 share/slib/charplot.scm
+share/slib/chez.init
+share/slib/clrnamdb.scm
 share/slib/cltime.scm
 share/slib/coerce.scm
 share/slib/collect.scm
@@ -43,20 +49,26 @@ share/slib/dirs.scm
 share/slib/dwindtst.scm
 share/slib/dynamic.scm
 share/slib/dynwind.scm
+share/slib/elk.init
 share/slib/eval.scm
 share/slib/factor.scm
 share/slib/fft.scm
 share/slib/fluidlet.scm
+share/slib/format.scm
+share/slib/formatst.scm
+share/slib/gambit.init
 share/slib/genwrite.scm
 share/slib/getopt.scm
 share/slib/getparam.scm
 share/slib/glob.scm
 share/slib/grapheps.scm
+share/slib/guile.init
 share/slib/hash.scm
 share/slib/hashtab.scm
 share/slib/html4each.scm
 share/slib/htmlform.scm
 share/slib/http-cgi.scm
+share/slib/jscheme.init
 share/slib/lineio.scm
 share/slib/logical.scm
 share/slib/macrotst.scm
@@ -65,6 +77,7 @@ share/slib/manifest.scm
 share/slib/matfile.scm
 share/slib/mbe.scm
 share/slib/minimize.scm
+share/slib/mitscheme.init
 share/slib/mkclrnam.scm
 share/slib/mklibcat.scm
 share/slib/modular.scm
@@ -78,6 +91,7 @@ share/slib/null.scm
 share/slib/obj2str.scm
 share/slib/object.scm
 share/slib/paramlst.scm
+share/slib/peanosfc.scm
 share/slib/phil-spc.scm
 share/slib/plottest.scm
 share/slib/pnm.scm
@@ -110,8 +124,12 @@ share/slib/scainit.scm
 share/slib/scamacr.scm
 share/slib/scanf.scm
 share/slib/scaoutp.scm
+share/slib/scheme2c.init
+share/slib/scheme48.init
 share/slib/schmooz.scm
+share/slib/scm.init
 share/slib/scmacro.scm
+share/slib/scsh.init
 share/slib/selfset.scm
 share/slib/sierpinski.scm
 share/slib/simetrix.scm
@@ -132,6 +150,8 @@ share/slib/subarray.scm
 share/slib/synchk.scm
 share/slib/synclo.scm
 share/slib/synrul.scm
+share/slib/t3.init
+share/slib/timecore.scm
 share/slib/timezone.scm
 share/slib/top-refs.scm
 share/slib/trace.scm
@@ -140,9 +160,11 @@ share/slib/tree.scm
 share/slib/trnscrpt.scm
 share/slib/tsort.scm
 share/slib/tzfile.scm
+share/slib/umbscheme.init
 share/slib/uri.scm
 share/slib/values.scm
 share/slib/vet.scm
+share/slib/vscm.init
 share/slib/withfile.scm
 share/slib/wttest.scm
 share/slib/wttree.scm
diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index 4678b6e2add..1c93329c385 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2005/02/24 13:20:41 alek Exp $
+# $OpenBSD: Makefile,v 1.19 2005/10/30 09:27:09 espie Exp $
 # losely based on the FreeBSD port
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "vax" || \
@@ -11,7 +11,7 @@ COMMENT=	"scheme r5 interpreter"
 
 CATEGORIES=	lang
 
-V=5d9
+V=5e1
 DISTNAME=	scm$V
 PKGNAME=	scm-$V
 EXTRACT_SUFX=	.zip
@@ -33,7 +33,7 @@ WANTLIB=		c curses termcap m readline
 FLAVORS=no_x11
 
 FLAVOR?=
-SCM_DATA=	COPYING Iedline.scm Init5d9.scm Link.scm \
+SCM_DATA=	COPYING Idiffer.scm Iedline.scm Init5e1.scm Link.scm \
 		Macexp.scm Macro.scm Transcen.scm Tscript.scm \
 		build build.scm compile.scm hobbit.scm mkimpcat.scm \
 		r4rstest.scm scmhob.scm \
@@ -61,18 +61,23 @@ WANTLIB+=	X11
 BUILD_DEPENDS=::devel/slib
 RUN_DEPENDS=::devel/slib
 
+FEATURE_LIST=
+.for f in ${FEATURES}
+FEATURE_LIST+=-F $f
+.endfor
+
 pre-build:
 	@echo "srcdir=${WRKSRC}" >${WRKSRC}/srcdir.mk
 
 post-build:
 	cd ${WRKSRC} && ${MAKE_ENV} PATH=${WRKSRC}:${PORTPATH} /bin/sh ./build \
-	    -F '${FEATURES}' \
+	    ${FEATURE_LIST} \
 	    ${OPTIONS} \
 	    -h system \
 	    -o scm \
 	    -s "${PREFIX}/share/scm/"
 	cd ${WRKSRC} && ${MAKE_ENV} PATH=${WRKSRC}:${PORTPATH} /bin/sh ./build \
-	    -F '${FEATURES} sicp' \
+	    ${FEATURE_LIST} -F sicp \
 	    ${OPTIONS} \
 	    -h system \
 	    -o scm-sicp \
diff --git a/lang/scm/distinfo b/lang/scm/distinfo
index e27f38999e3..1e38f519ba7 100644
--- a/lang/scm/distinfo
+++ b/lang/scm/distinfo
@@ -1,4 +1,4 @@
-MD5 (scm5d9.zip) = 27ca7806ca4fcb205b9f53a914853546
-RMD160 (scm5d9.zip) = cc150853146cfaa8cfb57bf54f863570a1f65ebc
-SHA1 (scm5d9.zip) = cac632cbf45f61451df1456cea9ca843913bd7ad
-SIZE (scm5d9.zip) = 843122
+MD5 (scm5e1.zip) = d16e3b63f958e13109efa57a72ab262c
+RMD160 (scm5e1.zip) = 2f4c2d05061db2f0929053b0c565631c7a4806e2
+SHA1 (scm5e1.zip) = 20bb517f1b6229644a1f3873d7607cac3569a5fa
+SIZE (scm5e1.zip) = 868500
diff --git a/lang/scm/patches/patch-build_scm b/lang/scm/patches/patch-build_scm
deleted file mode 100644
index dea49119b65..00000000000
--- a/lang/scm/patches/patch-build_scm
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-build_scm,v 1.1 2004/09/15 19:13:34 espie Exp $
---- build.scm.orig	Sun Nov 30 23:29:36 2003
-+++ build.scm	Sun Sep  5 11:45:36 2004
-@@ -633,9 +633,11 @@
-      (curses netbsd "-I/usr/pkg/include" "-lncurses" "-Wl,-rpath -Wl,/usr/pkg/lib -L/usr/pkg/lib" () ())
-      (editline netbsd "-I/usr/pkg/include" "-lreadline" "-Wl,-rpath -Wl,/usr/pkg/lib -L/usr/pkg/lib" () ())
-      (graphics netbsd "-I/usr/X11R6/include -DX11" "-lX11" "-Wl,-rpath -Wl,/usr/X11R6/lib -L/usr/X11R6/lib" () ())
-+     (dlll openbsd "-DSUN_DL" "" "" () ())
-      (m netbsd "" "-lm" #f () ())
-      (m openbsd "" "-lm" #f () ())
-      (curses openbsd "" "-lcurses" "/usr/lib/libcurses.a" () ())
-+     (regex openbsd "" "" #f () ())
-      ))
- 
-   '(compile-commands
diff --git a/lang/scm/pkg/PFRAG.no-no_x11 b/lang/scm/pkg/PFRAG.no-no_x11
index 2f1e4358ef2..437bf60cf69 100644
--- a/lang/scm/pkg/PFRAG.no-no_x11
+++ b/lang/scm/pkg/PFRAG.no-no_x11
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PFRAG.no-no_x11,v 1.2 2004/09/15 19:12:09 espie Exp $
+@comment $OpenBSD: PFRAG.no-no_x11,v 1.3 2005/10/30 09:27:09 espie Exp $
 @info info/Xlibscm.info
-share/scm/x11.scm
-share/scm/xevent.scm
-share/scm/xatoms.scm
 share/scm/keysymdef.scm
+share/scm/x11.scm
+share/scm/xatoms.scm
+share/scm/xevent.scm
diff --git a/lang/scm/pkg/PLIST b/lang/scm/pkg/PLIST
index 114829c33e0..9ddafb6ef12 100644
--- a/lang/scm/pkg/PLIST
+++ b/lang/scm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/09/15 19:12:09 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2005/10/30 09:27:09 espie Exp $
 bin/scm
 bin/scm-sicp
 bin/scmlit
@@ -12,8 +12,9 @@ include/scm/scmhob.h
 @man man/man1/scm.1
 share/scm/
 share/scm/COPYING
+share/scm/Idiffer.scm
 share/scm/Iedline.scm
-share/scm/Init5d9.scm
+share/scm/Init5e1.scm
 share/scm/Link.scm
 share/scm/Macexp.scm
 share/scm/Macro.scm