diff --git a/.gitignore b/.gitignore
index 12ae573..b8521c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,3 @@
 /vdr-osd2web-0.2.54.tar.gz
 /vdr-osd2web-0.2.56.tar.gz
 /vdr-osd2web-0.2.58.tar.gz
-/vdr-osd2web-0.3.0.tar.gz
-/vdr-osd2web-0.3.1.tar.gz
-/vdr-osd2web-0.3.2.tar.gz
diff --git a/sources b/sources
index 51348a5..e7962df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-osd2web-0.3.2.tar.gz) = de7bb75a36d9855011e082e4330bb043e4f9e5bcbfa3217219140978de7b81da76ff3e14dacd65a40c2f7097a85b964729fdb13c17a23691615ae59ee31c9caf
+SHA512 (vdr-osd2web-0.2.58.tar.gz) = 2c25fbb97482b1e0c1af3b12ed85978a4b1e7e0d2826dcff517e447018d13d1b6a8b580917853f7e4d7c0b46f7252a91be24dbd1f93ff190d2eaca3212b07cea
diff --git a/vdr-osd2web.spec b/vdr-osd2web.spec
index 49af934..be209d4 100644
--- a/vdr-osd2web.spec
+++ b/vdr-osd2web.spec
@@ -3,28 +3,25 @@
 %global pname   osd2web
 %global rname   vdr-plugin-osd2web
 %global __provides_exclude_from ^%{vdr_plugindir}/.*\\.so.*$
-
-# Set vdr_version based on Fedora version
-%if 0%{?fedora} >= 43
-%global vdr_version 2.7.7
-%elif 0%{?fedora} == 42
-%global vdr_version 2.7.4
-%else
-%global vdr_version 2.6.9
+# version we want build against
+%global vdr_version 2.6.1
+%if 0%{?fedora} >= 38
+%global vdr_version 2.6.3
 %endif
 
 Name:           vdr-%{pname}
-Version:        0.3.2
-Release:        20%{?dist}
+Version:        0.2.58
+Release:        1%{?dist}
 Summary:        VDR skin interface for the browser
-License:        GPL-2.0-or-later
+License:        GPLv2+
 URL:            https://github.com/horchi/vdr-plugin-osd2web
-Source0:        https://github.com/horchi/vdr-plugin-osd2web/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        https://github.com/horchi/vdr-plugin-osd2web/archive/%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
+Patch0:         %{name}-makefile.patch
+Patch1:         %{name}-ambiguous.patch
 
-BuildRequires:  make
+BuildRequires: make
 BuildRequires:  gcc-c++
-BuildRequires:  gettext
 BuildRequires:  vdr-devel >= %{vdr_version}
 BuildRequires:  libwebsockets-devel
 BuildRequires:  zlib-devel
@@ -81,77 +78,6 @@ install -Dpm 755 scripts/startBrowser.sh %{buildroot}%{vdr_plugindir}/bin/startB
 %{vdr_plugindir}/bin/startBrowser.sh
 
 %changelog
-* Sun Nov 30 2025 Peter Robinson <pbrobinson@fedoraproject.org> - 0.3.2-20
-- Rebuild against libwebsockets 4.5.0
-
-* Sat Aug 23 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 0.3.2-19
-- Rebuilt for tinyxml2 11.0.0
-
-* Fri Jul 25 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-18
-- Rebuilt for new VDR API version 2.7.7
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.2-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Jul 21 2025 Peter Robinson <pbrobinson@fedoraproject.org> - 0.3.2-16
-- Rebuild for libwebsockets 4.4
-
-* Sat Jun 21 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-15
-- Rebuilt for new VDR API version 2.7.6
-
-* Tue May 27 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-14
-- Rebuilt for new VDR API version 2.7.5
-
-* Fri Feb 28 2025 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-13
-- Rebuilt for new VDR API version 2.7.4
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.2-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Mon Nov 11 2024 Dominik Mierzejewski <dominik@greysector.net> - 0.3.2-11
-- rebuild for tinyxml2
-
-* Tue Oct 22 2024 Richard W.M. Jones <rjones@redhat.com> - 0.3.2-10
-- Rebuild for Jansson 2.14
-  (https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/3PYINSQGKQ4BB25NQUI2A2UCGGLAG5ND/)
-
-* Wed Oct 09 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-9
-- Rebuilt for new VDR API version 2.7.2
-
-* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 0.3.2-8
-- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jul 15 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-6
-- Rebuilt for new VDR API version 2.6.9
-
-* Fri Jul 12 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-5
-- Rebuilt for new VDR API version 2.6.8
-
-* Fri Apr 12 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-4
-- Rebuilt for new VDR API version
-
-* Fri Jan 26 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-3
-- Rebuilt for new VDR API version
-
-* Fri Jan 05 2024 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-2
-- Rebuilt for new VDR API version
-- Add BR gettext for rawhide
-
-* Mon Oct 23 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.3.2-1
-- Update to 0.3.2
-
-* Wed Oct 18 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.3.1-1
-- Update to 0.3.1
-
-* Wed Oct 11 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.3.0-1
-- Update to 0.3.0
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.58-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
 * Mon Mar 20 2023 Martin Gansser <martinkg@fedoraproject.org> - 0.2.58-1
 - Update to 0.2.58