diff --git a/.cvsignore b/.cvsignore
index e31e93d..5f0c773 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 socat-1.6.0.1.tar.bz2
+socat-1.7.0.0.tar.bz2
diff --git a/socat.spec b/socat.spec
index bade6b0..e90bbe6 100644
--- a/socat.spec
+++ b/socat.spec
@@ -1,7 +1,12 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
+<<<<<<< socat.spec
+Version: 1.7.0.0
+Release: 1%{?dist}
+=======
 Version: 1.6.0.1
 Release: 3%{?dist}
+>>>>>>> 1.11
 License: GPLv2
 Url:  http://www.dest-unreach.org/%{name}
 Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
@@ -19,10 +24,12 @@ line editor (readline), a program, or a combination of two of these.
 
 %prep
 %setup -q 
+iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8
+mv CHANGES.utf8 CHANGES
 
 %build
 %configure  \
-	--enable-help --enable-stdio \
+        --enable-help --enable-stdio \
         --enable-fdnum --enable-file --enable-creat \
         --enable-gopen --enable-pipe --enable-termios \
         --enable-unix --enable-ip4 --enable-ip6 \
@@ -56,6 +63,10 @@ rm -rf %{buildroot}
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
+* Tue Jan 20 2009 Paul Wouters <paul@xelerance.com 1.7.0.0-1
+- Updated to new upstream version
+- utf8 the CHANGES file
+
 * Sun Jan 18 2009 Tomas Mraz <tmraz@redhat.com> 1.6.0.1-3
 - disable the upstream openssl fips support
 
diff --git a/sources b/sources
index 396fd3d..5ee436a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a0dd33cde2a18eb382433aca8f76ce2  socat-1.6.0.1.tar.bz2
+be5f942c44dafefa58365e9dc3ada81f  socat-1.7.0.0.tar.bz2