diff --git a/libcli/README b/libcli/README
index 43e75c0b4..d7283393d 100644
--- a/libcli/README
+++ b/libcli/README
@@ -1,44 +1,45 @@
 libcli
 ------------------------------------------
-Libcli provides a shared library for including a Cisco-like command-line
+libcli provides a shared library for including a Cisco-like command-line
 interface into other software. It's a telnet interface which supports
 command-line editing, history, authentication and callbacks for a
 user-definable function tree.
 
 Runtime requirements:
-  crypt-1.2-1
-  cygwin-1.7.17-1
+  cygwin-1.7.33-1
+  libcli1.9.7-1.9.7-1bl2
+  libcrypt0-1.1-1
 
 Build requirements:
 (besides corresponding -devel packages)
-  autoconf-10-1
-  automake-7-1
-  binutils-2.23.51-1
-  cygport-0.11.3-1
-  gcc4-core-4.5.3-3
-  libtool-2.4-1
-  make-3.82.90-1
+  autoconf-13-1
+  automake-9-1
+  binutils-2.24.51-6
+  cygport-0.17.0-1
+  gcc-core-4.9.2-1
+  libtool-2.4.2-5
+  make-4.0-2
 
 Canonical website:
   http://sites.dparrish.com/libcli
 
 Canonical download:
-  git://github.com/dparrish/libcli.git
+  https://github.com/dparrish/libcli/archive/v1.9.7.tar.gz
 
 -------------------------------------------
 
 Build instructions:
-  unpack libcli-1.9.7-X-src.tar.bz2
+  unpack libcli-1.9.7-X-src.tar.xz
     if you use setup to install this src package, it will be
-	 unpacked under /usr/src automatically
+        unpacked under /usr/src automatically
   cd /usr/src
   cygport ./libcli-1.9.7-X.cygport all
 
 This will create:
-  /usr/src/libcli-1.9.7-X-src.tar.bz2
-  /usr/src/libcli-1.9.7-X.tar.bz2
-  /usr/src/libcli1.9.7-1.9.7-X.tar.bz2
-  /usr/src/libcli-devel-1.9.7-X.tar.bz2
+  /usr/src/libcli-1.9.7-X-src.tar.xz
+  /usr/src/libcli-1.9.7-X.tar.xz
+  /usr/src/libcli1.9.7-1.9.7-X.tar.xz
+  /usr/src/libcli-devel-1.9.7-X.tar.xz
 
 -------------------------------------------
 
@@ -55,12 +56,14 @@ Files included in the binary package:
 (libcli-devel)
   /usr/include/libcli.h
   /usr/lib/libcli.dll.a
-  /usr/lib/libcli.la
 
 ------------------
 
 Port Notes:
 
+----- version 1.9.7-1bl2 -----
+Rebuild on x86_64
+
 ----- version 1.9.7-1bl1 -----
 Version bump.
 
diff --git a/libcli/libcli-1.9.7-1bl1.cygport b/libcli/libcli-1.9.7-1bl1.cygport
deleted file mode 100644
index ee0a17722..000000000
--- a/libcli/libcli-1.9.7-1bl1.cygport
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION="Cisco style telnet command-line interface"
-HOMEPAGE="http://sites.dparrish.com/${PN}"
-GIT_URI="git://github.com/dparrish/${PN}.git"
-GIT_TAG="v${PV}"
-
-inherit git
-
-DIFF_EXCLUDES="
-	Makefile
-"
-
-PKG_NAMES="
-	${PN}
-	${PN}${PV}
-	${PN}-devel
-"
-libcli_CONTENTS="
-	usr/share
-"
-libcli1_9_7_CONTENTS="
-	usr/bin
-"
-libcli_devel_CONTENTS="
-	usr/include
-	usr/lib
-"
diff --git a/libcli/libcli-1.9.7-1bl1.src.patch b/libcli/libcli-1.9.7-1bl1.src.patch
deleted file mode 100644
index 85011bfb7..000000000
--- a/libcli/libcli-1.9.7-1bl1.src.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --strip-trailing-cr -uprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.log -x config.status -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x aclocal.m4 -x configure -x config.h -x '*.h.in' -x COPYING -x INSTALL -x ansi2knr.c -x ar-lib -x config-ml.in -x elisp-comp -x mdate-sh -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x GNUmakefile.in -x makefile.in -x libtool.m4 -x ltoptions.m4 -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltmain.sh -x compile -x config.guess -x config.sub -x depcomp -x install-sh -x missing -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 -x Makefile origsrc/libcli/Makefile.am src/libcli/Makefile.am
---- origsrc/libcli/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ src/libcli/Makefile.am	2013-03-31 21:37:01.487581600 +0900
-@@ -0,0 +1,12 @@
-+
-+check_PROGRAMS = clitest
-+clitest_LDADD = libcli.la
-+clitest_SOURCES = clitest.c
-+
-+include_HEADERS = libcli.h
-+
-+lib_LTLIBRARIES = libcli.la
-+libcli_la_CFLAGS = -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter -O3
-+libcli_la_LDFLAGS = -no-undefined -release $(VERSION)
-+libcli_la_SOURCES = libcli.c
-+
-diff --strip-trailing-cr -uprN -x CYGWIN-PATCHES -x aclocal.m4~ -x aclocal.m4t -x autom4te.cache -x config.cache -x config.log -x config.status -x '*SlackBuild*' -x '*.egg-info' -x '*.dll' -x '*.exe' -x '*.o' -x '*.gch' -x '*.jpg' -x '*.png' -x '*.qm' -x '*.svgz' -x '*.tif' -x '*.class' -x '*.jlc' -x '*.pyc' -x '*.pyo' -x '*.mo' -x '*.gmo' -x '*.orig' -x '*.rej' -x '*.spec' -x '*.temp' -x '*~' -x '*.stackdump' -x aclocal.m4 -x configure -x config.h -x '*.h.in' -x COPYING -x INSTALL -x ansi2knr.c -x ar-lib -x config-ml.in -x elisp-comp -x mdate-sh -x mkinstalldirs -x py-compile -x symlink-tree -x texinfo.tex -x ylwrap -x Makefile.in -x GNUmakefile.in -x makefile.in -x libtool.m4 -x ltoptions.m4 -x ltsugar.m4 -x ltversion.m4 -x lt~obsolete.m4 -x ltmain.sh -x compile -x config.guess -x config.sub -x depcomp -x install-sh -x missing -x omf.make -x xmldocs.make -x gnome-doc-utils.make -x gnome-doc-utils.m4 -x mate-doc-utils.make -x mate-doc-utils.m4 -x Makefile origsrc/libcli/configure.ac src/libcli/configure.ac
---- origsrc/libcli/configure.ac	1970-01-01 09:00:00.000000000 +0900
-+++ src/libcli/configure.ac	2013-03-31 21:36:50.409456600 +0900
-@@ -0,0 +1,33 @@
-+#                                               -*- Autoconf -*-
-+# Process this file with autoconf to produce a configure script.
-+
-+AC_PREREQ([2.68])
-+AC_INIT([libcli], [1.9.7])
-+AC_CONFIG_SRCDIR([clitest.c])
-+AC_CONFIG_HEADERS([config.h])
-+AM_INIT_AUTOMAKE
-+
-+# Checks for programs.
-+AC_PROG_CC
-+AC_PROG_INSTALL
-+AC_PROG_LN_S
-+LT_INIT
-+
-+# Checks for libraries.
-+AC_CHECK_LIB([crypt], [main])
-+
-+# Checks for header files.
-+AC_CHECK_HEADERS([arpa/inet.h malloc.h memory.h netinet/in.h stdlib.h string.h strings.h sys/socket.h sys/time.h unistd.h])
-+
-+# Checks for typedefs, structures, and compiler characteristics.
-+AC_TYPE_SIZE_T
-+AC_TYPE_SSIZE_T
-+
-+# Checks for library functions.
-+AC_FUNC_FORK
-+AC_FUNC_MALLOC
-+AC_FUNC_REALLOC
-+AC_CHECK_FUNCS([inet_ntoa memmove memset regcomp select socket strcasecmp strchr strdup strerror strncasecmp strpbrk strspn strstr])
-+
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
diff --git a/libcli/libcli-1.9.7-1bl2.cygport b/libcli/libcli-1.9.7-1bl2.cygport
new file mode 100644
index 000000000..e9768cabc
--- /dev/null
+++ b/libcli/libcli-1.9.7-1bl2.cygport
@@ -0,0 +1,33 @@
+HOMEPAGE="http://sites.dparrish.com/${PN}"
+SRC_URI="https://github.com/dparrish/${PN}/archive/v${PV}.tar.gz"
+
+CATEGORY="Libs"
+SUMMARY="Cisco style telnet command-line interface"
+DESCRIPTION="libcli provides a shared library for including a Cisco-like command-line
+interface into other software. It's a telnet interface which supports
+command-line editing, history, authentication and callbacks for a
+user-definable function tree."
+
+DIFF_EXCLUDES="
+	Makefile
+"
+
+PKG_NAMES="
+	${PN}
+	${PN}${PV}
+	${PN}-devel
+"
+libcli_CONTENTS="
+	usr/share
+"
+libcli1_9_7_CONTENTS="
+	usr/bin
+"
+libcli_devel_CONTENTS="
+	usr/include
+	usr/lib
+"
+
+libcli_SUMMARY="${SUMMARY} (licensing & readmes)"
+libcli1_9_7_SUMMARY="${SUMMARY} (runtime)"
+libcli_devel_SUMMARY="${SUMMARY} (development)"
diff --git a/libcli/libcli-1.9.7-1bl2.src.patch b/libcli/libcli-1.9.7-1bl2.src.patch
new file mode 100644
index 000000000..f38934377
--- /dev/null
+++ b/libcli/libcli-1.9.7-1bl2.src.patch
@@ -0,0 +1,51 @@
+--- origsrc/libcli-1.9.7/Makefile.am	1970-01-01 09:00:00.000000000 +0900
++++ src/libcli-1.9.7/Makefile.am	2014-12-05 00:56:46.873446100 +0900
+@@ -0,0 +1,12 @@
++
++check_PROGRAMS = clitest
++clitest_LDADD = libcli.la
++clitest_SOURCES = clitest.c
++
++include_HEADERS = libcli.h
++
++lib_LTLIBRARIES = libcli.la
++libcli_la_CFLAGS = -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter -O3
++libcli_la_LDFLAGS = -no-undefined -release $(VERSION)
++libcli_la_SOURCES = libcli.c
++
+--- origsrc/libcli-1.9.7/configure.ac	1970-01-01 09:00:00.000000000 +0900
++++ src/libcli-1.9.7/configure.ac	2014-12-05 00:58:15.307039900 +0900
+@@ -0,0 +1,33 @@
++#                                               -*- Autoconf -*-
++# Process this file with autoconf to produce a configure script.
++
++AC_PREREQ([2.69])
++AC_INIT([libcli], [1.9.7])
++AC_CONFIG_SRCDIR([clitest.c])
++AC_CONFIG_HEADERS([config.h])
++AM_INIT_AUTOMAKE
++
++# Checks for programs.
++AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++LT_INIT
++
++# Checks for libraries.
++AC_CHECK_LIB([crypt], [main])
++
++# Checks for header files.
++AC_CHECK_HEADERS([arpa/inet.h malloc.h memory.h netinet/in.h stdlib.h string.h strings.h sys/socket.h sys/time.h unistd.h])
++
++# Checks for typedefs, structures, and compiler characteristics.
++AC_TYPE_SIZE_T
++AC_TYPE_SSIZE_T
++
++# Checks for library functions.
++AC_FUNC_FORK
++AC_FUNC_MALLOC
++AC_FUNC_REALLOC
++AC_CHECK_FUNCS([inet_ntoa memmove memset regcomp select socket strcasecmp strchr strdup strerror strncasecmp strpbrk strspn strstr])
++
++AC_CONFIG_FILES([Makefile])
++AC_OUTPUT
diff --git a/libcli/libcli-devel.hint b/libcli/libcli-devel.hint
deleted file mode 100644
index eb4ead04a..000000000
--- a/libcli/libcli-devel.hint
+++ /dev/null
@@ -1,8 +0,0 @@
-category: Libs
-requires: cygwin libcli1.9.7
-external-source: libcli
-sdesc: "Cisco style telnet command-line interface (development)"
-ldesc: "Libcli provides a shared library for including a Cisco-like
-command-line interface into other software. It's a telnet interface which
-supports command-line editing, history, authentication and callbacks for a
-user-definable function tree."
diff --git a/libcli/libcli.hint b/libcli/libcli.hint
deleted file mode 100644
index 689da6ca1..000000000
--- a/libcli/libcli.hint
+++ /dev/null
@@ -1,7 +0,0 @@
-category: Libs
-requires: cygwin libcli1.9.7
-sdesc: "Cisco style telnet command-line interface (licensing & readmes)"
-ldesc: "Libcli provides a shared library for including a Cisco-like
-command-line interface into other software. It's a telnet interface which
-supports command-line editing, history, authentication and callbacks for a
-user-definable function tree."
diff --git a/libcli/libcli1.9.7.hint b/libcli/libcli1.9.7.hint
deleted file mode 100644
index 325af8810..000000000
--- a/libcli/libcli1.9.7.hint
+++ /dev/null
@@ -1,8 +0,0 @@
-category: Libs
-requires: cygwin crypt
-external-source: libcli
-sdesc: "Cisco style telnet command-line interface (runtime)"
-ldesc: "Libcli provides a shared library for including a Cisco-like
-command-line interface into other software. It's a telnet interface which
-supports command-line editing, history, authentication and callbacks for a
-user-definable function tree."