diff --git a/baselibs.conf b/baselibs.conf
index 5982492..f045526 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,4 +1,6 @@
 libzvbi0
+libzvbi-chains0
 zvbi-devel
 	requires -zvbi-<targettype>
 	requires "libzvbi0-<targettype> = <version>"
+	requires "libzvbi-chains0-<targettype> = <version>"
diff --git a/zvbi.changes b/zvbi.changes
index 6b766de..21cc8cb 100644
--- a/zvbi.changes
+++ b/zvbi.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Dec  6 08:10:39 UTC 2017 - mpluskal@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Add dropped dependency for libICE
+- Add dependency for libpng support
+- Split lang subpackage
+- Split library subpackages
+
 -------------------------------------------------------------------
 Tue Dec  5 15:28:02 UTC 2017 - crrodriguez@opensuse.org
 
diff --git a/zvbi.spec b/zvbi.spec
index 2985f73..6f97c23 100644
--- a/zvbi.spec
+++ b/zvbi.spec
@@ -16,23 +16,28 @@
 #
 
 
+%define         sover 0
+%define         libname lib%{name}%{sover}
+%define         libchains lib%{name}-chains%{sover}
 Name:           zvbi
-BuildRequires:  doxygen
-BuildRequires:  fdupes
-BuildRequires:  gcc-c++
-BuildRequires:  libtool
-BuildRequires:  pkgconfig(x11)
-Url:            http://zapping.sf.net/
 Version:        0.2.35
 Release:        0
 Summary:        Linux "VBI proxy"
-License:        LGPL-2.1+ and GPL-2.0+
+License:        LGPL-2.1+ AND GPL-2.0+
 Group:          Development/Libraries/Other
+Url:            http://zapping.sf.net/
 Source:         %{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
 Patch2:         zvbi-automake-1.13.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{!?make_build:%define make_build %{__make} -O %{?_smp_mflags}}
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  gcc-c++
+BuildRequires:  libpng-devel
+BuildRequires:  libtool
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(ice)
+BuildRequires:  pkgconfig(x11)
+Recommends:     %{name}-lang
 
 %description
 With "video4linux" drivers only one application at a time can capture
@@ -42,11 +47,26 @@ 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
 solution to this problem.
 
-%package -n libzvbi0
+%package -n %{libname}
 Summary:        VBI Decoding Library
 Group:          System/Libraries
 
-%description -n libzvbi0
+%description -n %{libname}
+VBI stands for Vertical Blanking Interval, a gap between the image data
+transmitted in an analog video signal. This gap is used to transmit AM
+modulated data for various data services like Teletext and Closed
+Caption.
+
+The zvbi library 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.
+
+%package -n %{libchains}
+Summary:        VBI Decoding Library
+Group:          System/Libraries
+Conflicts:      %{libname} < %{version}-%{release}
+
+%description -n %{libchains}
 VBI stands for Vertical Blanking Interval, a gap between the image data
 transmitted in an analog video signal. This gap is used to transmit AM
 modulated data for various data services like Teletext and Closed
@@ -59,14 +79,16 @@ data of several popular services.
 %package devel
 Summary:        VBI decoding library - devel package
 Group:          Development/Libraries/Other
-Requires:       glibc-devel
-Requires:       libzvbi0 = %{version}
+Requires:       %{libchains} = %{version}
+Requires:       %{libname} = %{version}
 
 %description devel
 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.
 
+%lang_package
+
 %prep
 %setup -q
 %patch2 -p1
@@ -77,32 +99,38 @@ ACLOCAL="aclocal -I m4" autoreconf -fi
 %make_build
 
 %install
-make DESTDIR="%{buildroot}" install
-rm %buildroot%_libdir/*.la
-%find_lang %name
-%fdupes -s doc/html
+%make_install
+find %{buildroot} -type f -name "*.la" -delete -print
+%find_lang %{name}
 
-%post -n libzvbi0 -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
+%post -n %{libchains} -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
+%postun -n %{libchains} -p /sbin/ldconfig
 
-%postun -n libzvbi0 -p /sbin/ldconfig
-
-%files -f %name.lang
-%defattr(-,root,root)
-%{_bindir}/*
-%{_sbindir}/zvbid
-%{_mandir}/man1/*
+%files
 %doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+%{_bindir}/zvbi-atsc-cc
+%{_bindir}/zvbi-chains
+%{_bindir}/zvbi-ntsc-cc
+%{_sbindir}/zvbid
+%{_mandir}/man1/zvbi-atsc-cc.1%{ext_man}
+%{_mandir}/man1/zvbi-chains.1%{ext_man}
+%{_mandir}/man1/zvbi-ntsc-cc.1%{ext_man}
+%{_mandir}/man1/zvbid.1%{ext_man}
 
-%files -n libzvbi0
-%defattr(-,root,root)
-%{_libdir}/libzvbi*.so.0
-%{_libdir}/libzvbi*.so.0.*
+%files lang -f %{name}.lang
+
+%files -n %{libname}
+%{_libdir}/libzvbi.so.%{sover}*
+
+%files -n %{libchains}
+%{_libdir}/libzvbi-chains.so.%{sover}*
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/libzvbi.h
-%{_libdir}/libzvbi*.so
-%{_libdir}/pkgconfig/zvbi-0.2.pc
-%doc doc/html
+%{_libdir}/libzvbi.so
+%{_libdir}/libzvbi-chains.so
+%{_libdir}/pkgconfig/zvbi-*.pc
 
 %changelog