diff --git a/CHANGES b/CHANGES
index 5c62f5e..3e9b357 100755
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Changes to proxytunnel version 1.6.4 -- Mon Feb 12 21:45:06 CEST 2007
+Changes to proxytunnel version 1.7.0 -- Sun Feb 25 17:45:38 CET 2007
 
 - Allow multiple '-H' options (headers), total size of the headers
   should not exceed 1k.
@@ -11,7 +11,7 @@ Changes to proxytunnel version 1.6.4 -- Mon Feb 12 21:45:06 CEST 2007
 - Reworked debug-output (dag-)
 - Signal handling (dag-)
 - Applied (reworked) changes from Mark Cave-Ayland to support -E option
-  encrypting data to the proxy with SSL (untested by me)
+  encrypting data to the proxy with SSL
 
 Changes to proxytunnel version 1.6.3 -- Mon Apr 10 12:48:02 CEST 2006
 
diff --git a/README b/README
index 77277e9..91b107a 100755
--- a/README
+++ b/README
@@ -3,8 +3,8 @@ proxytunnel
 -----------
 
 Author:		Jos Visser <josv@osp.nl>, Mark Janssen <maniac@maniac.nl>
-Date: 		Wed Jun 14 10:45:47 CEST 2006
-Version:	1.6.3
+Date: 		Sun Feb 25 17:47:55 CET 2007
+Version:	1.7.0
 
 Hi all,
 
@@ -22,7 +22,7 @@ Proxytunnel is very easy to use, when running proxytunnel with the help
 option it specifies it's command-line options.
 
 $ ./proxytunnel --help
-Proxytunnel 1.6.3
+Proxytunnel 1.7.0
 Copyright 2001-2006 Proxytunnel Project
 Jos Visser (Muppet) <josv@osp.nl>, Mark Janssen (Maniac) <maniac@maniac.nl>
 
@@ -34,7 +34,9 @@ Usage: Proxytunnel [OPTIONS]...
    -V         --version           Print version and exit
    -i         --inetd             Run from inetd (default=off)
    -a INT     --standalone=INT    Run as standalone daemon on specified port
-   -e         --encrypt           encrypt the communication using SSL
+   -e         --encrypt           encrypt the communication using SSL (between host and destination)
+   -E         --encrypt-proxy     encrypt the communitation between the client and the proxy using SSL
+   -x STRING  --proctitle=STRING  Set the process-title to STRING
    -p STRING  --proxy=STRING      Proxy host:port combination to connect to
    -d STRING  --dest=STRING       Destination host:port to built the tunnel to
 
@@ -60,7 +62,6 @@ Proxytunnel -i [ -u user ] -p proxy:port -d host:port [ -v | -q ]
 Proxytunnel -i [ -U envvar ] -p proxy:port -d host:port [ -v | -q ]
 Proxytunnel -a port -p proxy:port -d host:port [ -v | -q ]
 
-
 To use this program with OpenSSH to connect to a host somewhere, create
 a $HOME/.ssh/config file with the following content:
 
diff --git a/TODO b/TODO
index 91776ad..5d32ac8 100644
--- a/TODO
+++ b/TODO
@@ -13,13 +13,6 @@
   see: http://issues.apache.org/bugzilla/show_bug.cgi?id=29744
 
 
-### Putty support
-- Lobby for the putty project to include ProxyCommand functionality
-  see: http://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/proxy-command.html
-
-- Make proxytunnel build on Windows
----> Should already work, just-recompile and upload new binary to sf.net
-
 ### Generic improvements
 - Allow to add more than one HTTP header
   eg. -H "User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Win32)" -H "Keep-Alive: 300" -H "Connection: keep-alive"
diff --git a/config.h b/config.h
index 2d13b81..c4ba91d 100755
--- a/config.h
+++ b/config.h
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#define VERSION	"1.6.4"
+#define VERSION	"1.7.0"
 #define PACKAGE	"Proxytunnel"
 #define PURPOSE "Build generic tunnels through HTTPS proxies"
 #define AUTHORS "Jos Visser (Muppet) <josv@osp.nl>, Mark Janssen (Maniac) <maniac@maniac.nl>"
diff --git a/contrib/proxytunnel.spec b/contrib/proxytunnel.spec
index 833e100..694ede4 100644
--- a/contrib/proxytunnel.spec
+++ b/contrib/proxytunnel.spec
@@ -1,6 +1,6 @@
 Summary: Proxy Tunnel ssh-over-https hack.
 Name: proxytunnel
-Version: 1.6.0
+Version: 1.7.0
 Release: 0.1
 Copyright: GPL
 Group: Networking/Utilities