diff --git a/fix-headers.patch b/fix-headers.patch
deleted file mode 100644
index d852f69..0000000
--- a/fix-headers.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: src/io-dvb.c
-===================================================================
---- src/io-dvb.c.orig
-+++ src/io-dvb.c
-@@ -29,6 +29,7 @@
- #include <errno.h>
- #include <sys/select.h>
- #include <sys/ioctl.h>
-+#include <sys/stat.h>
- 
- #ifndef HAVE_S64_U64
-   /* Linux 2.6.x asm/types.h defines __s64 and __u64 only
-Index: src/io-v4l.c
-===================================================================
---- src/io-v4l.c.orig
-+++ src/io-v4l.c
-@@ -43,6 +43,7 @@ static const char rcsid [] =
- #include <sys/time.h>		/* timeval */
- #include <sys/types.h>		/* fd_set, uid_t */
- #include <sys/ioctl.h>		/* for (_)videodev.h */
-+#include <sys/stat.h>
- #include <pthread.h>
- 
- #include "videodev.h"
-Index: contrib/ntsc-cc.c
-===================================================================
---- contrib/ntsc-cc.c.orig
-+++ contrib/ntsc-cc.c
-@@ -34,6 +34,7 @@
- #include <locale.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <sys/time.h>
- #ifdef HAVE_GETOPT_LONG
- #  include <getopt.h>
diff --git a/zvbi-0.2.33.tar.bz2 b/zvbi-0.2.33.tar.bz2
deleted file mode 100644
index 099891d..0000000
--- a/zvbi-0.2.33.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09a709f6de5f42e7039cca2732a6ea211a397bb666b9110ee52658603be4fb7e
-size 935601
diff --git a/zvbi-0.2.35.tar.bz2 b/zvbi-0.2.35.tar.bz2
new file mode 100644
index 0000000..24b62ef
--- /dev/null
+++ b/zvbi-0.2.35.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc883c34111a487c4a783f91b1b2bb5610d8d8e58dcba80c7ab31e67e4765318
+size 1047761
diff --git a/zvbi.changes b/zvbi.changes
index 981912d..91cbad4 100644
--- a/zvbi.changes
+++ b/zvbi.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Sep 24 15:48:07 UTC 2013 - stephan.barth@suse.com
+
+- update to version 0.2.35 which includes numerous fixes that are listed in
+  the ChangeLog
+- added upstream ChangeLog to the package
+- removed fix-headers.patch because it is included in upstream now
+- added an fdupes call for the documentation files in the devel package
+
 -------------------------------------------------------------------
 Wed Mar 13 11:48:04 CET 2013 - pgajdos@suse.cz
 
diff --git a/zvbi.spec b/zvbi.spec
index 6ce9d29..3e22448 100644
--- a/zvbi.spec
+++ b/zvbi.spec
@@ -18,24 +18,24 @@
 
 Name:           zvbi
 BuildRequires:  doxygen
+BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
 BuildRequires:  xorg-x11-devel
 Url:            http://zapping.sf.net/
-Version:        0.2.33
+Version:        0.2.35
 Release:        0
 Summary:        Linux "VBI proxy"
 License:        LGPL-2.1+ and GPL-2.0+
 Group:          Development/Libraries/Other
 Source:         %{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
-Patch1:         fix-headers.patch
 Patch2:         zvbi-automake-1.13.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 With "video4linux" drivers only one application at a time can capture
-VBI data.  The 2nd generation "v4l2" API allows multiple clients to
+VB data.  The 2nd generation "v4l2" API allows multiple clients to
 open a device, but still only one client may read from the device.  If
 for example the Nxtvepg daemon runs in the background users will not be
 able to start a Teletext application.  The VBI proxy was developed as a
@@ -62,11 +62,12 @@ Requires:       glibc-devel
 Requires:       libzvbi0 = %{version}
 
 %description devel
-include files, static library, ...
+This package includes the development files for the zvbi library which
+provides routines to read from raw VBI sampling devices, to demodulate raw to
+sliced VBI data, and to interpret the data of several popular services.
 
 %prep
 %setup -q
-%patch1
 %patch2 -p1
 
 %build
@@ -82,6 +83,7 @@ make
 make DESTDIR="%{buildroot}" install
 rm %buildroot%_libdir/*.la
 %find_lang %name
+%fdupes -s doc/html
 
 %post -n libzvbi0 -p /sbin/ldconfig
 
@@ -92,7 +94,7 @@ rm %buildroot%_libdir/*.la
 %{_bindir}/*
 %{_sbindir}/zvbid
 %{_mandir}/man1/*
-%doc AUTHORS BUGS COPYING NEWS README TODO
+%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 
 %files -n libzvbi0
 %defattr(-,root,root)