diff --git a/Makefile.am b/Makefile.am
index 95e6cfe..9d33980 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src scheme doc extras benchmarks
+SUBDIRS = src scheme doc lib benchmarks
 EXTRA_DIST = README COPYING GPL-3 ACKNOWLEDGMENTS
 dist_doc_DATA=README COPYING GPL-3 ACKNOWLEDGMENTS
diff --git a/Makefile.in b/Makefile.in
index e56f7cd..84316b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -183,7 +183,7 @@ target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src scheme doc extras benchmarks
+SUBDIRS = src scheme doc lib benchmarks
 EXTRA_DIST = README COPYING GPL-3 ACKNOWLEDGMENTS
 dist_doc_DATA = README COPYING GPL-3 ACKNOWLEDGMENTS
 all: config.h
diff --git a/configure b/configure
index e5adeb3..f00328c 100755
--- a/configure
+++ b/configure
@@ -8296,7 +8296,7 @@ done
 
 ac_config_headers="$ac_config_headers config.h"
 
-ac_config_files="$ac_config_files Makefile src/Makefile scheme/Makefile doc/Makefile extras/Makefile benchmarks/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile scheme/Makefile doc/Makefile lib/Makefile benchmarks/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -8895,7 +8895,7 @@ do
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "scheme/Makefile") CONFIG_FILES="$CONFIG_FILES scheme/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-    "extras/Makefile") CONFIG_FILES="$CONFIG_FILES extras/Makefile" ;;
+    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "benchmarks/Makefile") CONFIG_FILES="$CONFIG_FILES benchmarks/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff --git a/configure.ac b/configure.ac
index 0793d95..00d41a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,6 +88,6 @@ AC_FUNC_STRFTIME
 AC_FUNC_STRTOD
 AC_CHECK_FUNCS([bzero gettimeofday memmove memset munmap setenv sqrt strerror])
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES(Makefile src/Makefile scheme/Makefile doc/Makefile extras/Makefile benchmarks/Makefile)
+AC_CONFIG_FILES(Makefile src/Makefile scheme/Makefile doc/Makefile lib/Makefile benchmarks/Makefile)
 AC_OUTPUT #(Makefile src/Makefile scheme/Makefile doc/Makefile)
 
diff --git a/extras/Makefile.am b/lib/Makefile.am
similarity index 100%
rename from extras/Makefile.am
rename to lib/Makefile.am
diff --git a/extras/Makefile.in b/lib/Makefile.in
similarity index 98%
rename from extras/Makefile.in
rename to lib/Makefile.in
index 35a0c68..bd1b47e 100644
--- a/extras/Makefile.in
+++ b/lib/Makefile.in
@@ -33,7 +33,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-subdir = extras
+subdir = lib
 DIST_COMMON = $(dist_libstreams_DATA) $(dist_pkglib_DATA) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -172,9 +172,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  extras/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  lib/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  extras/Makefile
+	  $(AUTOMAKE) --foreign  lib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/extras/streams.ss b/lib/streams.ss
similarity index 100%
rename from extras/streams.ss
rename to lib/streams.ss
diff --git a/extras/streams/derived.ss b/lib/streams/derived.ss
similarity index 100%
rename from extras/streams/derived.ss
rename to lib/streams/derived.ss
diff --git a/extras/streams/primitive.ss b/lib/streams/primitive.ss
similarity index 100%
rename from extras/streams/primitive.ss
rename to lib/streams/primitive.ss
diff --git a/scheme/last-revision b/scheme/last-revision
index 7784c89..ff7ff4d 100644
--- a/scheme/last-revision
+++ b/scheme/last-revision
@@ -1 +1 @@
-1153
+1154