diff --git a/srcpkgs/c-client-devel b/srcpkgs/c-client-devel
new file mode 120000
index 0000000000..5a05949368
--- /dev/null
+++ b/srcpkgs/c-client-devel
@@ -0,0 +1 @@
+c-client
\ No newline at end of file
diff --git a/srcpkgs/c-client/patches/c-client-2006k_GENTOO_amd64-so-fix.patch b/srcpkgs/c-client/patches/c-client-2006k_GENTOO_amd64-so-fix.patch
new file mode 100644
index 0000000000..53b94d05a6
--- /dev/null
+++ b/srcpkgs/c-client/patches/c-client-2006k_GENTOO_amd64-so-fix.patch
@@ -0,0 +1,13 @@
+diff -r 7c3e6c6ef2ba src/osdep/unix/Makefile
+--- src/osdep/unix/Makefile	Thu Feb 21 18:51:32 2008 +0100
++++ src/osdep/unix/Makefile	Thu Feb 21 18:53:15 2008 +0100
+@@ -962,6 +962,9 @@ onceenv:
+ 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
+ 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+ 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
++	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
++	 -Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
++	 >> ARCHIVE
+ 	echo $(OS) > OSTYPE
+ 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
+ 	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
new file mode 100644
index 0000000000..b33493bac1
--- /dev/null
+++ b/srcpkgs/c-client/template
@@ -0,0 +1,45 @@
+# Template build file for 'c-client'
+pkgname=c-client
+version=2007f
+revision=1
+short_desc="IMAP client library"
+maintainer="John Regan <john@jrjrtech.com>"
+license="Apache"
+homepage="http://www.washington.edu/imap"
+distfiles="ftp://ftp.cac.washington.edu/imap/imap-${version}.tar.gz"
+checksum="53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28"
+wrksrc="imap-${version}"
+makedepends="pam-devel libressl-devel e2fsprogs-devel"
+nocross="yes"
+
+do_configure() {
+	sed \
+	  -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \
+	  -e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \
+	  -e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \
+	  -i src/osdep/unix/Makefile
+}
+
+do_build() {
+	yes "y" | make lnp PASSWDTYPE=pam SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC -lcom_err -lpam"
+}
+
+do_install() {
+	install -D -m755 c-client/libc-client.so.1.0.0 $DESTDIR/usr/lib/libc-client.so.1.0.0
+}
+
+c-client-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		install -D -m644 c-client/c-client.a $PKGDESTDIR/usr/lib/c-client.a
+		ln -sf c-client.a $PKGDESTDIR/usr/lib/libc-client.a
+		ln -sf /usr/lib/libc-client.so.1.0.0 $PKGDESTDIR/usr/lib/libc-client.so
+		ln -sf /usr/lib/libc-client.so.1.0.0 $PKGDESTDIR/usr/lib/libc-client.so.1
+		for i in c-client mail imap4r1 rfc822 linkage misc smtp nntp \
+		  osdep env_unix env fs ftl nl tcp sslio utf8 utf8aux; do
+			install -D -m644 c-client/${i}.h $PKGDESTDIR/usr/include/imap/${i}.h
+		done
+	}
+}
+