diff --git a/scheme/packages.scm b/scheme/packages.scm
index c937a71..9870fbc 100644
--- a/scheme/packages.scm
+++ b/scheme/packages.scm
@@ -420,7 +420,7 @@
   (files (lib parse-forms)))
 
 (define-structure htmlout htmlout-interface
-  (open scsh scsh-utilities string-lib formats ascii receiving scheme)
+  (open scsh scsh-utilities srfi-13 formats ascii receiving scheme)
   (files (lib htmlout)))
 
 (define-structures
@@ -439,7 +439,7 @@
 (define-structure rfc822 rfc822-interface
   (open receiving	; MV return (RECEIVE and VALUES)
 	scsh-utilities	; index
-	string-lib
+	srfi-13
 	let-opt         ; let-optionals
 	crlf-io		; read-crlf-line
 	ascii		; ascii->char
@@ -450,7 +450,7 @@
 
 (define-structure uri uri-interface
   (open scsh-utilities
-	string-lib
+	srfi-13
 	let-opt
 	receiving
 	
@@ -483,7 +483,7 @@
         signals
         error-package
         ecm-utilities
-	string-lib
+	srfi-13
 	let-opt
         scheme)
   (files (lib ftp)))
@@ -522,7 +522,7 @@
         scsh        
         error-package
         ecm-utilities
-	string-lib
+	srfi-13
 	conditions signals handle
 	let-opt
         scheme)
@@ -536,7 +536,7 @@
         conditions
         signals
         ecm-utilities
-	string-lib
+	srfi-13
         scheme)
   (files (lib pop3)))
 
@@ -613,7 +613,7 @@
 
 (define-structure ecm-utilities ecm-utilities-interface
   (open scsh
-	string-lib
+	srfi-13
         scheme)
   (files (lib ecm-utilities)))
 
@@ -656,7 +656,7 @@
 	locks
 	thread-fluids               ; fork-thread
 	fluids
-	string-lib
+	srfi-13
 	big-util
 	defrec-package
 	crlf-io
@@ -676,7 +676,7 @@
 	receiving			; receive
 	crlf-io				; write-crlf, read-crlf-line
 	rfc822				; read-rfc822-headers
-	srfi-14			; char-set-complement, char-set:whitespace 
+	srfi-14				; char-set-complement, char-set:whitespace 
 	handle				; ignore-errors
 	conditions			; condition-stuff
 	uri
@@ -684,7 +684,7 @@
 	formats				; format
 	format-net			; format-internet-host-address
 	rate-limit			; rate-limiting stuff
-	string-lib			; STRING-INDEX
+	srfi-13				; STRING-INDEX
 	dns				; dns-lookup-ip
 	sunet-utilities                 ; socket-address->string 
 	locks				; make-lock et al.
@@ -711,7 +711,7 @@
 	httpd-responses
 	httpd-request
 	httpd-error
-	string-lib    ; STRING-MAP
+	srfi-13    ; STRING-MAP
 	scsh
 	scheme)
   (files (httpd access-control)))
@@ -730,7 +730,7 @@
 	httpd-request			; request record
 	formats				; format
 	format-net			; format-internet-host-address
-	string-lib			; string-join, string-trim
+	srfi-13			; string-join, string-trim
 	rfc822				; get-header
 	sunet-utilities			; on-interrupt
 	threads				; spawn
@@ -785,7 +785,7 @@
 	htmlout				; Formatted HTML output
 	error-package			; ERROR
 	pp				; Pretty-printer
-	string-lib			; STRING-SKIP
+	srfi-13			; STRING-SKIP
 	rfc822
 	toothless-eval			; EVAL-SAFELY
 	handle				; IGNORE-ERROR
@@ -796,7 +796,7 @@
 
 (define-structure info-gateway  info-gateway-interface
   (open big-scheme
-	string-lib
+	srfi-13
 	conditions signals handle
 	htmlout
 	httpd-request
@@ -821,12 +821,12 @@
 	handle-fatal-error
 	scsh
 	let-opt
-	string-lib
+	srfi-13
 	scheme)
   (files (httpd rman-gateway)))
 
 (define-structure cgi-server cgi-server-interface
-  (open	string-lib
+  (open	srfi-13
 	rfc822
 	crlf-io			; WRITE-CRLF
 	uri