diff --git a/.cvsignore b/.cvsignore
index 103ddcb..8dba99c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 socat-1.6.0.1.tar.bz2
 socat-1.7.0.0.tar.bz2
 socat-1.7.1.1.tar.bz2
+socat-1.7.1.2.tar.gz
diff --git a/socat.spec b/socat.spec
index 61acaa9..6b06439 100644
--- a/socat.spec
+++ b/socat.spec
@@ -1,15 +1,14 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
-Version: 1.7.1.1
-Release: 5%{?dist}
+Version: 1.7.1.2
+Release: 1%{?dist}
 License: GPLv2
 Url:  http://www.dest-unreach.org/%{name}
-Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.bz2
-Patch0: socat-wall.patch
+Source: http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.gz
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel readline-devel ncurses-devel kernel-headers > 2.6.18
-BuildRequires: autoconf
+BuildRequires: openssl-devel compat-readline5-devel ncurses-devel
+BuildRequires: autoconf kernel-headers > 2.6.18
 
 %description
 Socat is a relay for bidirectional data transfer between two independent data
@@ -17,16 +16,17 @@ channels. Each of these data channels may be a file, pipe, device (serial line
 etc. or a pseudo terminal), a socket (UNIX, IP4, IP6 - raw, UDP, TCP), an
 SSL socket, proxy CONNECT connection, a file descriptor (stdin etc.), the GNU
 line editor (readline), a program, or a combination of two of these. 
+The compat-readline5 library is used to avoid GPLv2 vs GPLv3 issues.
 
 
 %prep
 %setup -q 
 iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8
 mv CHANGES.utf8 CHANGES
-%patch0
 
 %build
 autoconf
+export CPPFLAGS="-I%{_includedir}/readline5" LDFLAGS="-L%{_libdir}/readline5"
 %configure  \
         --enable-help --enable-stdio \
         --enable-fdnum --enable-file --enable-creat \
@@ -62,6 +62,11 @@ rm -rf %{buildroot}
 %doc %{_mandir}/man1/socat.1*
 
 %changelog
+* Sat Jan 30 2010 Paul Wouters <paul@xelerance.com> - 1.7.1.2-1
+- Upgraded to 1.7.1.2
+- Link against compat-readline5 for GPLv2 license (Miroslav Lichvar)
+  (bz #511310)
+
 * Sat Aug 29 2009 Caolán McNamara <caolanm@redhat.com> - 1.7.1.1-5
 - recreate autoconf to get correct includes when determining type
   sizes in order to build correctly
diff --git a/sources b/sources
index cbf5bae..5e77503 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-be5f942c44dafefa58365e9dc3ada81f  socat-1.7.0.0.tar.bz2
-5aec1860fe15a258ddb900685d7510c1  socat-1.7.1.1.tar.bz2
+2a5b7b0355421a039fb68b7541181b38  socat-1.7.1.2.tar.gz