diff --git a/.gitignore b/.gitignore
index b7cf58c..a86439d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
 zvbi-0.2.33.tar.bz2
-/zvbi-0.2.42.tar.gz
-/zvbi-0.2.43.tar.gz
-/zvbi-0.2.44.tar.gz
diff --git a/sources b/sources
index 0c6fcd7..c88e027 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zvbi-0.2.44.tar.gz) = 74b7d44faf42f919ebd3ccb69f8567f56909075d3acf4a3b4dfcbdf85489492f27d8a04173e0010f59706356e4078cd10911945f87e2596de2b897672d1e55cb
+95e53eb208c65ba6667fd4341455fa27  zvbi-0.2.35.tar.bz2
diff --git a/zvbi.spec b/zvbi.spec
index 55b88a0..1a4338b 100644
--- a/zvbi.spec
+++ b/zvbi.spec
@@ -2,29 +2,30 @@
 %define             catalogue %{_sysconfdir}/X11/fontpath.d
 
 Name:               zvbi
-Version:            0.2.44
-Release:            2%{?dist}
+Version:            0.2.35
+Release:            16%{?dist}
 Summary:            Raw VBI, Teletext and Closed Caption decoding library
-License:            GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND MIT
-URL:                https://github.com/zapping-vbi/zvbi
-Source0:            https://github.com/zapping-vbi/zvbi/archive/v%{version}/%{name}-%{version}.tar.gz
+# See NEWS for a full breakdown of licensing.
+License:            LGPLv2+ and GPLv2+ and BSD
+URL:                http://zapping.sourceforge.net/ZVBI/index.html
+Source0:            http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2
 Patch0:             %{name}-0.2.24-tvfonts.patch
 Patch1:             %{name}-0.2.25-openfix.patch
 
-BuildRequires:      autoconf
-BuildRequires:      automake
-BuildRequires:      bdftopcf
+BuildRequires: make
+BuildRequires:      gcc-c++
 BuildRequires:      doxygen
 BuildRequires:      fontconfig
-BuildRequires:      gcc-c++
-BuildRequires:      gettext-devel
-BuildRequires:      libICE-devel
+BuildRequires:      gettext >= 0.16.1
 BuildRequires:      libpng-devel
-BuildRequires:      libtool
-BuildRequires:      make
+BuildRequires:      libICE-devel
+BuildRequires:      bdftopcf
 BuildRequires:      mkfontdir
 BuildRequires:      systemd-units
-BuildRequires:      tzdata
+
+Requires(post):     systemd-units
+Requires(preun):    systemd-units
+Requires(postun):   systemd-units
 
 
 %description
@@ -47,7 +48,7 @@ Development files for zvbi
 
 %package fonts
 Summary:            Fonts from zvbi converted to X11
-BuildArch:          noarch
+BuildArch:	    noarch
 Obsoletes:          xawtv-tv-fonts < 3.95
 Provides:           xawtv-tv-fonts >= 3.95
 
@@ -57,8 +58,11 @@ Fonts from zvbi converted for use with X11
 
 %prep
 %setup -q
-%patch -P 0 -p1
-%patch -P 1 -p1
+%patch0 -p1
+%patch1 -p1
+
+# Fix character encodings
+iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README
 
 # systemd service file
 cat >zvbid.service <<EOF
@@ -77,7 +81,6 @@ EOF
 
 
 %build
-./autogen.sh
 # Note: We don't do --enable-static=no because static libs are needed to build
 # x11font during compile time to convert zvbi fonts into x11 fonts. x11font
 # is thrown away and not installed as it's not useful for anything else
@@ -86,7 +89,7 @@ EOF
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-%make_build
+make %{?_smp_mflags}
 
 # Generate fonts, fonts.alias and fonts.dir
 pushd contrib
@@ -104,7 +107,7 @@ popd
 
 %install
 mkdir -p %{buildroot}%{fontdir}
-%make_install
+make install DESTDIR=%{buildroot}
 
 %find_lang %{name}
 
@@ -119,13 +122,6 @@ touch %{buildroot}%{fontdir}/fonts.cache-1
 mkdir -p %{buildroot}%{catalogue}
 ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name}
 
-find %{buildroot}%{_libdir} -name '*.a' -delete
-
-
-%check
-cd test
-make check
-
 
 %post
 %systemd_post zvbid.service
@@ -140,16 +136,14 @@ make check
 
 
 %files -f %{name}.lang
-%license COPYING.md
-%doc AUTHORS BUGS ChangeLog NEWS README.md TODO
 %{_bindir}/%{name}*
-%if ! (0%{?fedora} >= 42)
 %{_sbindir}/zvbid
-%endif
 %{_unitdir}/zvbid.service
-%{_libdir}/libzvbi.so.0*
-%{_libdir}/libzvbi-chains.so.0*
-%{_mandir}/man1/zvbi*1*
+%{_libdir}/*.so.*
+%{_mandir}/man1/*
+%exclude %{_libdir}/*.a
+%exclude %{_libdir}/*.la
+%doc AUTHORS BUGS ChangeLog COPYING COPYING.LIB NEWS README TODO
 
 
 %files devel
@@ -168,44 +162,6 @@ make check
 
 
 %changelog
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.44-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Mar 14 2025 Xavier Bachelot <xavier@bachelot.org> - 0.2.44-1
-- Update to 0.2.44 (RHBZ#2351225)
-- Acknowledge for bin/sbin merge in F42+
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.43-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Tue Dec 10 2024 Xavier Bachelot <xavier@bachelot.org> - 0.2.43-1
-- Update to 0.2.43 (RHBZ#2330170)
-
-* Fri Sep 13 2024 Xavier Bachelot <xavier@bachelot.org> - 0.2.42-1
-- Update to 0.2.42
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed May 17 2023 David Cantrell <dcantrell@redhat.com> - 0.2.35-20
-- Update License tag to use SPDX identifiers
-- Change deprecated %%patchN macros to %%patch -P N
-
-* Sun Feb 05 2023 Kalev Lember <klember@redhat.com> - 0.2.35-19
-- Avoid requiring systemd for systemd rpm scriptlets
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild