diff --git a/CHANGES b/CHANGES
index d77b669..27c1f8d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 
+
 security:
 	(CVE Id pending)
 	Fixed problems with signal handling caused by use of not async signal
@@ -101,6 +102,8 @@ porting:
 	support external BUILD_DATE env var to allow to build reproducable
 	binaries
 
+	Joachim Fenkes provided an new adapted spec file.
+
 testing:
 	Do not distribute testcert.conf with socat source but generate it
 	(and new testcert6.conf) during test.sh run.
diff --git a/socat.spec b/socat.spec
index 4215362..583e97e 100644
--- a/socat.spec
+++ b/socat.spec
@@ -1,14 +1,14 @@
 
 %define majorver 1.7
-%define minorver 2.0
+%define minorver 2.4
 
 Summary: socat - multipurpose relay
 Name: socat
 Version: %{majorver}.%{minorver}
 Release: 1
-Copyright: GPL
+License: GPL
 Group: Applications/Communications
-Source0: http://www.dest-unreach.org/socat/download/socat-%{version}.tar.gz
+Source0: http://www.dest-unreach.org/socat/download/socat-%{version}.tar.bz2
 Requires: readline
 Requires: openssl
 BuildRoot: /var/tmp/%{name}-buildroot
@@ -20,7 +20,7 @@ modem etc.), socket (UNIX, IP4, IP6 - raw, UDP, TCP), a file descriptor (stdin
 etc.), a program, or an arbitrary combination of two of these.
 
 %prep
-%setup -n %{name}-%{majorver}
+%setup -n %{name}-%{version}
 
 %build
 # the CPPFLAGS setting is required for RedHat Linux
@@ -44,7 +44,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc README CHANGES EXAMPLES SECURITY xio.help socat.html FAQ BUGREPORTS
+%doc README CHANGES EXAMPLES SECURITY doc/xio.help doc/socat.html FAQ BUGREPORTS
 %doc COPYING COPYING.OpenSSL FILES PORTING DEVELOPMENT
 %{_bindir}/socat
 %{_bindir}/procan