diff --git a/Makefile b/Makefile
index 2051cf4..d4af71d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@
 # weedle (16aug06) - 1.6.2
 # xatu (14oct06) - 1.6.3
 # yanma (19nov06) - 1.6.4
+# zubat (18feb07) - 1.7
 
 
 ifeq ($(wildcard /sbin/md5),/sbin/md5)
diff --git a/README b/README
index 5eb0a48..04faf72 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-paramiko 1.6.4
-"yanma" release, 19 nov 2006
+paramiko 1.7
+"zubat" release, 18 feb 2007
 
 Copyright (c) 2003-2007  Robey Pointer <robey@lag.net>
 
@@ -151,6 +151,17 @@ which will verify that most of the core components are working correctly.
 
 highlights of what's new in each release:
 
+v1.7 ZUBAT
+* added x11 channel support (patch from david guerizec)
+* added reverse port forwarding support
+* (bug 75370) raise an exception when contacting a broken SFTP server
+* (bug 80295) SSHClient shouldn't expand the user directory twice when reading
+  RSA/DSS keys
+* (bug 82383) typo in DSS key in SSHClient
+* (bug 83523) python 2.5 warning when encoding a file's modification time
+* if connecting to an SSH agent fails, silently fallback instead of raising
+  an exception
+
 v1.6.4 YANMA
 * fix setup.py on osx (oops!)
 * (bug 69330) check for the existence of RSA/DSA keys before trying to open
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index 6bdcc11..65f2820 100644
--- a/paramiko/__init__.py
+++ b/paramiko/__init__.py
@@ -47,7 +47,7 @@ released under the GNU Lesser General Public License (LGPL).
 
 Website: U{http://www.lag.net/paramiko/}
 
-@version: 1.6.4 (yanma)
+@version: 1.7 (zubat)
 @author: Robey Pointer
 @contact: robey@lag.net
 @license: GNU Lesser General Public License (LGPL)
@@ -60,9 +60,9 @@ if sys.version_info < (2, 2):
 
 
 __author__ = "Robey Pointer <robey@lag.net>"
-__date__ = "19 Nov 2006"
-__version__ = "1.6.4 (yanma)"
-__version_info__ = (1, 6, 4)
+__date__ = "18 Feb 2007"
+__version__ = "1.7 (zubat)"
+__version_info__ = (1, 7, 0)
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 439b5ef..8a1ab1b 100644
--- a/paramiko/transport.py
+++ b/paramiko/transport.py
@@ -149,7 +149,7 @@ class Transport (threading.Thread):
     """
 
     _PROTO_ID = '2.0'
-    _CLIENT_ID = 'paramiko_1.6.4'
+    _CLIENT_ID = 'paramiko_1.7'
 
     _preferred_ciphers = ( 'aes128-cbc', 'blowfish-cbc', 'aes256-cbc', '3des-cbc' )
     _preferred_macs = ( 'hmac-sha1', 'hmac-md5', 'hmac-sha1-96', 'hmac-md5-96' )
diff --git a/setup.py b/setup.py
index 0535542..b853e39 100644
--- a/setup.py
+++ b/setup.py
@@ -48,13 +48,13 @@ if sys.platform == 'darwin':
 
 
 setup(name = "paramiko",
-      version = "1.6.4",
+      version = "1.7",
       description = "SSH2 protocol library",
       author = "Robey Pointer",
       author_email = "robey@lag.net",
       url = "http://www.lag.net/paramiko/",
       packages = [ 'paramiko' ],
-      download_url = 'http://www.lag.net/paramiko/download/paramiko-1.6.4.zip',
+      download_url = 'http://www.lag.net/paramiko/download/paramiko-1.7.zip',
       license = 'LGPL',
       platforms = 'Posix; MacOS X; Windows',
       classifiers = [ 'Development Status :: 5 - Production/Stable',