diff -ruN cyrus-imspd-v1.7a-vanilla/Makefile.in cyrus-imspd-v1.7a/Makefile.in
--- cyrus-imspd-v1.7a-vanilla/Makefile.in	1997-10-28 19:12:07.000000000 -0800
+++ cyrus-imspd-v1.7a/Makefile.in	2003-09-10 13:24:02.000000000 -0700
@@ -21,7 +21,7 @@
 # SOFTWARE.
 # 
 
-SUBDIRS = lib imsp @EXTRA_SUBDIRS@
+SUBDIRS = imsp @EXTRA_SUBDIRS@
 
 srcdir = @srcdir@
 VPATH = @srcdir@
diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/Makefile.in cyrus-imspd-v1.7a/imsp/Makefile.in
--- cyrus-imspd-v1.7a-vanilla/imsp/Makefile.in	2000-12-17 19:37:53.000000000 -0800
+++ cyrus-imspd-v1.7a/imsp/Makefile.in	2003-09-10 13:25:06.000000000 -0700
@@ -48,8 +48,8 @@
 
 DEFS = @DEFS@ $(DEFINES)
 CPPFLAGS = -I.. -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ 
-LIBS = @LIBS@
-DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
+LIBS = @LIBS@ -L/usr/lib -lcyrus
+DEPLIBS = @DEPLIBS@
 
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/abook.c cyrus-imspd-v1.7a/imsp/abook.c
--- cyrus-imspd-v1.7a-vanilla/imsp/abook.c	2000-12-17 17:47:03.000000000 -0800
+++ cyrus-imspd-v1.7a/imsp/abook.c	2003-09-10 13:27:47.000000000 -0700
@@ -108,7 +108,7 @@
     
     /* get the ACL */
     if (!acl && sdb_get(abooks, name, SDB_ICASE, &acl) < 0) return (0);
-    if (acl) mask = acl_myrights(auth_get_state(id), acl);
+    if (acl) mask = cyrus_acl_myrights(auth_get_state(id), acl);
 
     /* check for administrator */
     if (auth_level(id) == AUTH_ADMIN) mask |= ACL_ALL;
@@ -700,7 +700,7 @@
 		    strcpy(tmpacl, "\t");
 		    tmpc = name[osrclen];
 		    name[osrclen] = '\0';
-		    acl_set(&tmpacl, name, ACL_MODE_SET, ACL_ALL, NULL, NULL);
+		    cyrus_acl_set(&tmpacl, name, ACL_MODE_SET, ACL_ALL, NULL, NULL);
 		    name[osrclen] = tmpc;
 		}
 		value = tmpacl;
@@ -932,7 +932,7 @@
 		strcpy(acl, "\t");
 		tmpc = name[ownerlen];
 		name[ownerlen] = '\0';
-		acl_set(&acl, name, ACL_MODE_SET, ACL_ALL, NULL, NULL);
+		cyrus_acl_set(&acl, name, ACL_MODE_SET, ACL_ALL, NULL, NULL);
 		name[ownerlen] = tmpc;
 	    }
 	} else {
@@ -941,9 +941,9 @@
 	}
 	/* update acl */
 	if (acl
-	    && acl_set(&acl, ident, ACL_MODE_SET, 
-		       rights ? acl_strtomask(rights) : 0L, 
-		       NULL, NULL) == 0) {
+	    && cyrus_acl_set(&acl, ident, ACL_MODE_SET, 
+		             rights ? cyrus_acl_strtomask(rights) : 0L, 
+		             NULL, NULL) == 0) {
 	    if (sdb_set(abooks, name, SDB_ICASE, acl) == 0) {
 		result = AB_SUCCESS;
 	    }
@@ -966,7 +966,7 @@
     char *name, *rights;
 {
     /* some more error checking might be in order... */
-    acl_masktostr(abook_rights(id, name, NULL), rights);
+    cyrus_acl_masktostr(abook_rights(id, name, NULL), rights);
 
     return (AB_SUCCESS);
 }
diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/authize.c cyrus-imspd-v1.7a/imsp/authize.c
--- cyrus-imspd-v1.7a-vanilla/imsp/authize.c	2003-08-06 09:56:53.000000000 -0700
+++ cyrus-imspd-v1.7a/imsp/authize.c	2003-09-10 13:28:11.000000000 -0700
@@ -122,7 +122,7 @@
 
     /* Get an authentication state from the libcyrus "auth" module
      * (not to be confused the the IMSP authize module in this file).
-     * This is needed for acl_myrights(). 
+     * This is needed for cyrus_acl_myrights(). 
      * Free id->state in case this isn't the first authentication this session.
      */
     if (id->state)
diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/bb.c cyrus-imspd-v1.7a/imsp/bb.c
--- cyrus-imspd-v1.7a-vanilla/imsp/bb.c	2000-02-10 14:10:21.000000000 -0800
+++ cyrus-imspd-v1.7a/imsp/bb.c	2003-09-10 13:28:37.000000000 -0700
@@ -385,7 +385,7 @@
     struct auth_state *id;
     char *name, *acl;
 {
-    long rights = acl_myrights(id, acl);
+    long rights = cyrus_acl_myrights(id, acl);
     char *user = auth_username(id);
     int len = strlen(user);
 
diff -ruN cyrus-imspd-v1.7a-vanilla/imsp/imsp_server.c cyrus-imspd-v1.7a/imsp/imsp_server.c
--- cyrus-imspd-v1.7a-vanilla/imsp/imsp_server.c	2003-08-06 09:56:54.000000000 -0700
+++ cyrus-imspd-v1.7a/imsp/imsp_server.c	2003-09-10 13:30:25.000000000 -0700
@@ -1273,7 +1273,7 @@
 		    defacl = malloc(defacllen);
 		    if (defacl) {
 			snprintf(acl = defacl, defacllen, "%s\t%s\t", user,
-				acl_masktostr(ACL_ALL, rbuf));
+				cyrus_acl_masktostr(ACL_ALL, rbuf));
 		    }
 		}
 	    }