diff --git a/mail/c-client/Makefile b/mail/c-client/Makefile
index 817cb21b4f9..1376adcdabc 100644
--- a/mail/c-client/Makefile
+++ b/mail/c-client/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.32 2005/12/26 13:16:16 steven Exp $
+# $OpenBSD: Makefile,v 1.33 2006/10/12 08:23:25 jakob Exp $
 
 COMMENT=	"University of Washington's c-client mail access routines"
 NO_REGRESS=	Yes
 
-VERSION=	4.61
+VERSION=	4.64
 DISTNAME=	pine${VERSION}
 PKGNAME=	c-client-${VERSION}p0
 SHARED_LIBS=	c-client	4.0
diff --git a/mail/c-client/distinfo b/mail/c-client/distinfo
index c1a009b9a67..c1eaaa4197f 100644
--- a/mail/c-client/distinfo
+++ b/mail/c-client/distinfo
@@ -1,4 +1,4 @@
-MD5 (pine4.61.tar.gz) = 960e3e854f07fae5aaa9a40c4f887526
-RMD160 (pine4.61.tar.gz) = 3f4710c2dbf13b58c8a92be055a1bebcc132c6f3
-SHA1 (pine4.61.tar.gz) = b1563bcd46897c83eee6b1ec213ebc131f8bbccf
-SIZE (pine4.61.tar.gz) = 4059861
+MD5 (pine4.64.tar.gz) = 9cc68749675f1c35a2147a35d2c5b344
+RMD160 (pine4.64.tar.gz) = cde245875694c629126e13e373bda622fb58ee3d
+SHA1 (pine4.64.tar.gz) = 95ed9e9155da28e422e4f2d9b89881862dce9d7b
+SIZE (pine4.64.tar.gz) = 4218629
diff --git a/mail/c-client/patches/patch-Makefile b/mail/c-client/patches/patch-Makefile
index 59bd690bae0..a542ad53095 100644
--- a/mail/c-client/patches/patch-Makefile
+++ b/mail/c-client/patches/patch-Makefile
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile,v 1.10 2004/07/18 22:30:19 jakob Exp $
---- Makefile.orig	Tue Apr 27 18:55:24 2004
-+++ Makefile	Wed Jul  7 17:45:07 2004
-@@ -178,7 +178,7 @@ SSLTYPE=nopwd
+$OpenBSD: patch-Makefile,v 1.11 2006/10/12 08:23:25 jakob Exp $
+--- Makefile.orig	Sat Apr 30 22:50:20 2005
++++ Makefile	Thu Oct 12 10:15:37 2006
+@@ -180,7 +180,7 @@ SSLTYPE=nopwd
  # 4	(default) IPv4 support only
  # 6	IPv6 and IPv4 support
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.10 2004/07/18 22:30:19 jakob Exp $
  
  
  # The following extra compilation flags are defined.  None of these flags are
-@@ -270,7 +270,7 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
+@@ -283,7 +283,7 @@ BUILD=$(MAKE) build EXTRACFLAGS='$(EXTRA
  
  # Make the IMAP Toolkit
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile,v 1.10 2004/07/18 22:30:19 jakob Exp $
  
  c-client:
  	@echo Not processed yet.  In a first-time build, you must specify
-@@ -442,13 +442,7 @@ sslunix sslsco:
+@@ -470,13 +470,7 @@ sslunix sslsco:
  	@echo ++ TLS/SSL encryption is supported
  	@echo + Non-compliant:
  	@echo ++ Unencrypted plaintext passwords are permitted
@@ -33,7 +33,7 @@ $OpenBSD: patch-Makefile,v 1.10 2004/07/18 22:30:19 jakob Exp $
  
  sslnone:
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -484,7 +478,7 @@ an ua:
+@@ -512,7 +506,7 @@ an ua:
  	$(TOOLS)/$@ "$(LN)" src/tmail tmail
  	$(LN) $(TOOLS)/$@ .
  
diff --git a/mail/c-client/patches/patch-src_c-client_mail_c b/mail/c-client/patches/patch-src_c-client_mail_c
index f121bcdd02b..90dff2b4405 100644
--- a/mail/c-client/patches/patch-src_c-client_mail_c
+++ b/mail/c-client/patches/patch-src_c-client_mail_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_c-client_mail_c,v 1.3 2004/07/18 22:30:19 jakob Exp $
---- src/c-client/mail.c.orig	Wed Jul  7 17:12:16 2004
-+++ src/c-client/mail.c	Wed Jul  7 17:11:58 2004
-@@ -3069,7 +3069,11 @@ void mail_dlog (char *string,long flag)
+$OpenBSD: patch-src_c-client_mail_c,v 1.4 2006/10/12 08:23:25 jakob Exp $
+--- src/c-client/mail.c.orig	Thu Sep 15 18:57:31 2005
++++ src/c-client/mail.c	Thu Oct 12 10:15:37 2006
+@@ -3103,7 +3103,11 @@ void mail_dlog (char *string,long flag)
  {
    mm_dlog ((debugsensitive || !flag) ? string : "<suppressed>");
  }
diff --git a/mail/c-client/patches/patch-src_osdep_unix_Makefile b/mail/c-client/patches/patch-src_osdep_unix_Makefile
index 623250c39cf..2407833e1b5 100644
--- a/mail/c-client/patches/patch-src_osdep_unix_Makefile
+++ b/mail/c-client/patches/patch-src_osdep_unix_Makefile
@@ -1,7 +1,6 @@
-$OpenBSD: patch-src_osdep_unix_Makefile,v 1.13 2004/07/18 22:30:19 jakob Exp $
---- src/osdep/unix/Makefile.orig	Thu Apr 29 23:10:25 2004
-+++ src/osdep/unix/Makefile	Wed Jul  7 17:49:39 2004
-@@ -24,13 +24,13 @@ EXTRAAUTHENTICATORS=
+--- src/osdep/unix/Makefile.orig	Sat Apr 30 22:51:13 2005
++++ src/osdep/unix/Makefile	Thu Oct 12 10:15:37 2006
+@@ -24,7 +24,7 @@ EXTRAAUTHENTICATORS=
  EXTRADRIVERS=mbox
  PASSWDTYPE=std
  SSLTYPE=nopwd
@@ -9,6 +8,9 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.13 2004/07/18 22:30:19 jakob Exp $
 +IP=6
  
  
+ # The optimization level here for GCC ports is set here for a reason.  It's
+@@ -41,8 +41,8 @@ GCCOPTLEVEL= -O2
+ 
  # Extended flags needed for SSL.  You may need to modify.
  
 -SSLDIR=/usr/local/ssl
@@ -18,7 +20,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.13 2004/07/18 22:30:19 jakob Exp $
  SSLKEYS=$(SSLCERTS)
  SSLINCLUDE=$(SSLDIR)/include
  SSLLIB=$(SSLDIR)/lib
-@@ -109,6 +109,7 @@ RANLIB=ranlib
+@@ -121,6 +121,7 @@ RANLIB=ranlib
  DEFAULTAUTHENTICATORS=md5 pla log
  DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf unix news phile
  
@@ -26,7 +28,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.13 2004/07/18 22:30:19 jakob Exp $
  
  # Normally no need to change any of these
  
-@@ -117,6 +118,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o 
+@@ -129,6 +130,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o 
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
   unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
@@ -34,7 +36,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.13 2004/07/18 22:30:19 jakob Exp $
  CFLAGS=-g
  
  CAT=cat
-@@ -125,6 +127,11 @@ MV=mv
+@@ -137,6 +139,11 @@ MV=mv
  RM=rm -rf
  SH=sh
  
@@ -46,16 +48,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.13 2004/07/18 22:30:19 jakob Exp $
  
  # Primary build command
  
-@@ -236,7 +243,7 @@ bso:	# OpenBSD
- 	 SPOOLDIR=/var \
- 	 ACTIVEFILE=/usr/local/news/lib/active \
- 	 RSHPATH=/usr/bin/rsh \
--	 BASECFLAGS="-O2 -pipe"
-+	 BASECFLAGS="-pipe"
- 
- cvx:	# Convex
- 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
-@@ -786,23 +793,32 @@ vu2:	# VAX Ultrix 2.3, etc.
+@@ -801,23 +808,33 @@ vu2:	# VAX Ultrix 2.3, etc.
  
  # Build it!
  
@@ -75,6 +68,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.13 2004/07/18 22:30:19 jakob Exp $
  
 +$(SHLIB): $(SOBINARIES)
 +	$(CC) -shared $(PICFLAG) -o $(SHLIB) $(SOBINARIES)
++
 +
  .c.o:
  	`$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
@@ -90,7 +84,7 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.13 2004/07/18 22:30:19 jakob Exp $
  
  
  # Dependencies
-@@ -835,7 +851,7 @@ utf8.o: mail.h misc.h osdep.h utf8.h
+@@ -850,7 +867,7 @@ utf8.o: mail.h misc.h osdep.h utf8.h
  
  # OS-dependent
  
@@ -98,8 +92,8 @@ $OpenBSD: patch-src_osdep_unix_Makefile,v 1.13 2004/07/18 22:30:19 jakob Exp $
 +OSDEPS=	mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
  	osdep.h env_unix.h tcp_unix.h \
  	osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c ip_unix.c\
- 	auths.c crexcl.c flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \
-@@ -848,12 +864,12 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n
+ 	auths.c crexcl.c flockcyg.c flocklnx.c flocksim.c nfstest.c fsync.c \
+@@ -864,12 +881,12 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h n
  	write.c sslstdio.c \
  	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
  	OSCFLAGS
diff --git a/mail/c-client/patches/patch-src_osdep_unix_env_unix_c b/mail/c-client/patches/patch-src_osdep_unix_env_unix_c
index 6b95e5a4806..f09434a9695 100644
--- a/mail/c-client/patches/patch-src_osdep_unix_env_unix_c
+++ b/mail/c-client/patches/patch-src_osdep_unix_env_unix_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_osdep_unix_env_unix_c,v 1.2 2004/07/18 22:30:19 jakob Exp $
---- src/osdep/unix/env_unix.c.orig	Wed Jul  7 17:19:57 2004
-+++ src/osdep/unix/env_unix.c	Wed Jul  7 17:20:32 2004
-@@ -797,15 +797,12 @@ char *myhomedir ()
+$OpenBSD: patch-src_osdep_unix_env_unix_c,v 1.3 2006/10/12 08:23:25 jakob Exp $
+--- src/osdep/unix/env_unix.c.orig	Mon Sep 13 23:31:19 2004
++++ src/osdep/unix/env_unix.c	Thu Oct 12 10:15:37 2006
+@@ -809,15 +809,12 @@ char *myhomedir ()
  static char *mymailboxdir ()
  {
    char *home = myhomedir ();