diff --git a/.SRCINFO b/.SRCINFO
index 822e06aae65a..6d2bf3b601a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,28 @@
 pkgbase = cyphertite
 	pkgdesc = A high-security scalable solution for online backups
-	pkgver = 1.6.3
+	pkgver = 1.6.6
 	pkgrel = 1
 	url = https://opensource.conformal.com/wiki/cyphertite
 	arch = i686
 	arch = x86_64
 	license = ISC
-	makedepends = libclens=0.7.0
-	depends = libassl=1.4.1
-	depends = libclog=0.6.4
-	depends = libexude=0.7.3
-	depends = libshrink=0.5.4
-	depends = libxmlsd=0.10.1
+	makedepends = libclens
+	depends = libassl
+	depends = libclog
+	depends = libexude
+	depends = libshrink
+	depends = libxmlsd
+	depends = curl>=7.15.1
 	depends = expat
+	depends = libbsd
 	depends = libedit
-	depends = libevent
-	depends = libssh2
-	depends = sqlite
-	source = https://opensource.conformal.com/snapshots/cyphertite/cyphertite-1.6.3.tar.gz
-	sha1sums = ec9c0cddd0f4662764fede03035caf2a358de101
+	depends = libevent>=2.0.10
+	depends = openssl>=1.0.1.c
+	depends = sqlite>=3.0.0
+	source = https://opensource.conformal.com/snapshots/cyphertite/cyphertite-1.6.6.tar.gz
+	source = cyphertite-dynamic-link.patch
+	sha1sums = 9c787d964de383e8dac1f25afa0531aee4ea8b4a
+	sha1sums = 2f90214c2827dd7e66bcffe7724d0415a2411822
 
 pkgname = cyphertite
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ad356aebb80..9fd354df44af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,70 @@
 #Maintainer: Dan Ziemba <zman0900@gmail.com>
 
 pkgname=cyphertite
-pkgver=1.6.3
+pkgver=1.6.6
 pkgrel=1
 pkgdesc="A high-security scalable solution for online backups"
 arch=(i686 x86_64)
 url="https://opensource.conformal.com/wiki/cyphertite"
 license=(ISC)
 
-depends=('libassl=1.4.1'
-         'libclog=0.6.4'
-         'libexude=0.7.3'
-         'libshrink=0.5.4'
-         'libxmlsd=0.10.1'
+depends=('libassl'
+         'libclog'
+         'libexude'
+         'libshrink'
+         'libxmlsd'
+         'curl>=7.15.1'
          'expat'
+         'libbsd'
          'libedit'
-         'libevent'
-         'libssh2'
-         'sqlite'
+         'libevent>=2.0.10'
+         'openssl>=1.0.1.c'
+         'sqlite>=3.0.0'
 )
-makedepends=('libclens=0.7.0')
+makedepends=('libclens')
 
-source=(https://opensource.conformal.com/snapshots/cyphertite/cyphertite-$pkgver.tar.gz)
-sha1sums=('ec9c0cddd0f4662764fede03035caf2a358de101')
+source=(https://opensource.conformal.com/snapshots/cyphertite/cyphertite-$pkgver.tar.gz
+        cyphertite-dynamic-link.patch)
+sha1sums=('9c787d964de383e8dac1f25afa0531aee4ea8b4a'
+          '2f90214c2827dd7e66bcffe7724d0415a2411822')
+
+prepare() {
+	cd "$pkgname-$pkgver"
+	patch -u -p0 -i $srcdir/cyphertite-dynamic-link.patch
+}
 
 build() {
 	cd "$pkgname-$pkgver"
 	make LOCALBASE=/usr obj
+
+	msg "Building ctutil..."
 	make -C ctutil LOCALBASE=/usr
+
+	msg "Building libcyphertite..."
 	make -C libcyphertite LOCALBASE=/usr
+
+	msg "Building cyphertite..."
 	make -C cyphertite LOCALBASE=/usr
-	make -C examples LOCALBASE=/usr
 }
 
 package() {
-	# Bug in libcypherite makefile
-	mkdir -p "$pkgdir/usr/share/man/man3"
-
 	cd "$pkgname-$pkgver"
-	make LOCALBASE=/usr DESTDIR="$pkgdir" install
+	make -C cyphertite LOCALBASE=/usr DESTDIR="$pkgdir" install
+
+	mkdir -p $pkgdir/usr/share/licenses/$pkgname
+	cat <<EOF >$pkgdir/usr/share/licenses/$pkgname/LICENSE
+ISC
+.
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+EOF
 }
diff --git a/cyphertite-dynamic-link.patch b/cyphertite-dynamic-link.patch
new file mode 100644
index 000000000000..20427a8ca37b
--- /dev/null
+++ b/cyphertite-dynamic-link.patch
@@ -0,0 +1,13 @@
+--- cyphertite/GNUmakefile.orig	2013-10-17 16:30:24.000000000 -0400
++++ cyphertite/GNUmakefile	2013-10-30 20:32:26.815983695 -0400
+@@ -51,8 +51,8 @@
+ CFLAGS += $(INCFLAGS) $(WARNFLAGS) $(OPTLEVEL) $(DEBUG)
+ LDLIBS += -L../ctutil/obj -L../ctutil -L../libcyphertite/obj -L../libcyphertite
+ LDLIBS += -lcyphertite -lctutil -lassl -lexude -lclog -lshrink -lxmlsd
+-LDLIBS += -lclens -levent_core -lexpat -lsqlite3 -llzma -llzo2 $(CURL.LDLIBS)
+-LDLIBS += $(LIB.LINKSTATIC) -lssl -lcrypto
++LDLIBS += -lclens -levent_core -lexpat -lsqlite3 -llzma -llzo2
++LDLIBS += $(LIB.LINKDYNAMIC) -lssl -lcrypto -lcurl
+ LDLIBS += $(LIB.LINKDYNAMIC) -ldl -ledit -lncurses -lz
+ 
+ BIN.NAME = cyphertite