diff --git a/.gitignore b/.gitignore
index ef0a383..86169b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 rdesktop-1.5.0.tar.gz
 rdesktop-1.6.0.tar.gz
+/rdesktop-1.7.0.tar.gz
diff --git a/rdesktop-CVE-2011-1595.patch b/rdesktop-CVE-2011-1595.patch
deleted file mode 100644
index b83d68c..0000000
--- a/rdesktop-CVE-2011-1595.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: disk.c
-===================================================================
---- disk.c	(revision 1620)
-+++ disk.c	(arbetskopia)
-@@ -356,6 +356,19 @@
- 		filename[strlen(filename) - 1] = 0;
- 	sprintf(path, "%s%s", g_rdpdr_device[device_id].local_path, filename);
- 
-+	/* Protect against mailicous servers:
-+	   somelongpath/..     not allowed
-+	   somelongpath/../b   not allowed
-+	   somelongpath/..b    in principle ok, but currently not allowed
-+	   somelongpath/b..    ok
-+	   somelongpath/b..b   ok
-+	   somelongpath/b../c  ok
-+	 */
-+	if (strstr(path, "/.."))
-+	{
-+		return RD_STATUS_ACCESS_DENIED;
-+	}
-+
- 	switch (create_disposition)
- 	{
- 		case CREATE_ALWAYS:
diff --git a/rdesktop-pcsc.patch b/rdesktop-pcsc.patch
index 7817146..0192005 100644
--- a/rdesktop-pcsc.patch
+++ b/rdesktop-pcsc.patch
@@ -1,14 +1,6 @@
 diff -up rdesktop-1.6.0/scard.c.pcsc rdesktop-1.6.0/scard.c
 --- rdesktop-1.6.0/scard.c.pcsc	2008-02-14 12:37:18.000000000 +0100
 +++ rdesktop-1.6.0/scard.c	2010-11-17 22:34:15.238453021 +0100
-@@ -40,7 +40,6 @@
- /* variable segment */
- 
- #define SCARD_MAX_MEM 102400
--#define SCARD_AUTOALLOCATE -1
- #define	OUT_STREAM_SIZE	4096
- 
- #ifdef B_ENDIAN
 @@ -1235,10 +1234,10 @@ TS_SCardLocateCardsByATR(STREAM in, STRE
  	in_uint8a(in, pAtrMasks, atrMaskCount * sizeof(SCARD_ATRMASK_L));
  
diff --git a/rdesktop.spec b/rdesktop.spec
index 3cf587b..ecc0742 100644
--- a/rdesktop.spec
+++ b/rdesktop.spec
@@ -1,15 +1,14 @@
 Name:           rdesktop
-Version:        1.6.0
-Release:        12%{?dist}
+Version:        1.7.0
+Release:        1%{?dist}
 Summary:        X client for remote desktop into Windows Terminal Server
 
 Group:          User Interface/Desktops
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://www.rdesktop.org/
 Source0:        http://downloads.sourceforge.net/rdesktop/%{name}-%{version}.tar.gz
 Patch0:         %{name}-pcsc.patch
 Patch1:         %{name}-libao.patch
-Patch2:         %{name}-CVE-2011-1595.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libao-devel
 BuildRequires:  libX11-devel
@@ -26,7 +25,6 @@ desktop. Unlike Citrix ICA, no server extensions are required.
 %setup -q
 %patch0 -p1 -b .pcsc
 %patch1 -p1 -b .ao
-%patch2 -p0 -b .CVE-2011-1595
 
 %build
 %configure --with-ipv6 --enable-smartcard --with-sound=libao
@@ -47,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Mon May 30 2011 Kalev Lember <kalev@smartlink.ee> - 1.7.0-1
+- Update to 1.7.0
+
 * Mon May 30 2011 Kalev Lember <kalev@smartlink.ee> - 1.6.0-12
 - Prevent remote file access (CVE-2011-1595)
 
diff --git a/sources b/sources
index 68461b1..2fc1ca1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-433546f60fc0f201e99307ba188369ed  rdesktop-1.5.0.tar.gz
-c6fcbed7f0ad7e60ac5fcb2d324d8b16  rdesktop-1.6.0.tar.gz
+77fa93b21aa38837a85e81c00e757228  rdesktop-1.7.0.tar.gz