diff --git a/Makefile b/Makefile
index 629b3fd..57d354a 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@
 # squirtle (19feb06) - 1.5.3
 # tentacool (11mar06) - 1.5.4
 # umbreon (10may06) - 1.6
+# vulpix (10jul06) - 1.6.1
 
 
 release:
@@ -34,6 +35,9 @@ clean:
 	rm -rf build dist
 	rm -f MANIFEST *.log demos/*.log
 
+test:
+	python ./test.py
+
 # places where the version number is stored:
 #
 # setup.py
diff --git a/README b/README
index 1f541b2..c6b0a82 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-paramiko 1.6
-"umbreon" release, 10 may 2006
+paramiko 1.6.1
+"vulpix" release, 10 jul 2006
 
 Copyright (c) 2003-2006 Robey Pointer <robey@lag.net>
 
@@ -138,6 +138,13 @@ which will verify that most of the core components are working correctly.
 
 highlights of what's new in each release:
 
+v1.6.1 VULPIX
+* more unit tests fixed for windows/cygwin (thanks to alexander belchenko)
+* a couple of fixes related to exceptions leaking out of SFTPClient
+* added ability to set items in HostKeys via __setitem__
+* HostKeys now retains order and has a save() method
+* added PKey.write_private_key and PKey.from_private_key
+
 v1.6 UMBREON
 * pageant support on Windows thanks to john arbash meinel and todd whiteman
 * fixed unit tests to work under windows and cygwin (thanks to alexander
@@ -211,7 +218,6 @@ v1.5 PARAS
 
 ***  MISSING LINKS
 
-* [sigh] release a fork of pycrypto with the speed improvements
 * host-based auth (yuck!)
 * ctr forms of ciphers are missing (blowfish-ctr, aes128-ctr, aes256-ctr)
 * sftp protocol 6 support (ugh....) -- once it settles down more
diff --git a/paramiko/__init__.py b/paramiko/__init__.py
index e134677..34f71f0 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 (umbreon)
+@version: 1.6.1 (vulpix)
 @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__ = "10 May 2006"
-__version__ = "1.6 (umbreon)"
-__version_info__ = (1, 6, 0)
+__date__ = "10 Jul 2006"
+__version__ = "1.6.1 (vulpix)"
+__version_info__ = (1, 6, 1)
 __license__ = "GNU Lesser General Public License (LGPL)"
 
 
diff --git a/paramiko/transport.py b/paramiko/transport.py
index 7d714dd..05d3087 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'
+    _CLIENT_ID = 'paramiko_1.6.1'
 
     _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 003bc39..54299c8 100644
--- a/setup.py
+++ b/setup.py
@@ -42,13 +42,13 @@ except ImportError:
     kw = {}
 
 setup(name = "paramiko",
-      version = "1.6",
+      version = "1.6.1",
       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.zip',
+      download_url = 'http://www.lag.net/paramiko/download/paramiko-1.6.1.zip',
       license = 'LGPL',
       platforms = 'Posix; MacOS X; Windows',
       classifiers = [ 'Development Status :: 5 - Production/Stable',