diff --git a/libreoffice.spec b/libreoffice.spec
index e17d18f..7f27dc2 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -365,6 +365,12 @@ Requires(preun):  gtk2 >= 2.9.4
 Requires(postun): gtk2 >= 2.9.4
 Obsoletes: libreoffice-binfilter < 1:4.0.0.0
 Obsoletes: libreoffice-javafilter < 1:4.1.0.0
+Obsoletes: openoffice.org-core < 1:3.3.1
+Obsoletes: openoffice.org-brand < 1:3.3.1, broffice.org-brand < 1:3.3.1
+Obsoletes: openoffice.org-javafilter < 1:3.3.1
+Obsoletes: openoffice.org-langpack-ms < 1:3.3.1, libreoffice-langpack-ms < 1:3.3.99.1
+Obsoletes: openoffice.org-langpack-ur < 1:3.3.1, libreoffice-langpack-ur < 1:3.3.99.1
+Obsoletes: openoffice.org-testtools < 1:3.3.1
 Obsoletes: libreoffice-testtools < 1:3.4.99.1
 Obsoletes: autocorr-eu < 1:4.0.1.2
 %if 0%{?rhel} && 0%{?rhel} < 7
@@ -384,6 +390,7 @@ Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: python3
 %else
 Requires: python
+Obsoletes: openoffice.org-pyuno < 1:3.3.1
 %endif
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-pyuno%{?_isa} = 1:3.3.0
@@ -406,6 +413,9 @@ Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-calc = %{epoch}:%{version}-%{release}
 Obsoletes: %{name}-report-builder < 1:4.1.0.0
+Obsoletes: openoffice.org-base-core < 1:3.3.1
+Obsoletes: openoffice.org-base < 1:3.3.1, broffice.org-base < 1:3.3.1
+Obsoletes: openoffice.org-report-builder < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-base-core%{?_isa} = 1:3.3.0
 Provides: openoffice.org-base%{?_isa} = 1:3.3.0, broffice.org-base%{?_isa} = 1:3.3.0
@@ -421,6 +431,7 @@ Summary: BeanShell support for LibreOffice
 Group: Development/Libraries
 Requires: bsh
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org-bsh < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-bsh%{?_isa} = 1:3.3.0
 %endif
@@ -432,6 +443,7 @@ Support BeanShell scripts in LibreOffice.
 Summary: JavaScript support for LibreOffice
 Group: Development/Libraries
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org-rhino < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-rhino%{?_isa} = 1:3.3.0
 %endif
@@ -452,6 +464,7 @@ Requires: apache-commons-lang, apache-commons-logging
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-writer = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org-wiki-publisher < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-wiki-publisher%{?_isa} = 1:3.3.0
 %endif
@@ -478,6 +491,7 @@ Group: Applications/Productivity
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-impress = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org-ogltrans < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-ogltrans%{?_isa} = 1:3.3.0
 %endif
@@ -492,6 +506,7 @@ Group: Applications/Productivity
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-draw = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org-pdfimport < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-pdfimport%{?_isa} = 1:3.3.0
 %endif
@@ -504,6 +519,8 @@ and enable basic editing of PDF documents.
 Summary: LibreOffice dingbats font
 Group: User Interface/X
 Requires: fontpackages-filesystem
+Obsoletes: openoffice.org-fonts < 1:3.3.1
+Obsoletes: openoffice.org-opensymbol-fonts < 1:3.3.1
 BuildArch: noarch
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-fonts = 1:3.3.0
@@ -519,6 +536,8 @@ Summary: LibreOffice Word Processor Application
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org-writer-core < 1:3.3.1
+Obsoletes: openoffice.org-writer < 1:3.3.1, broffice.org-writer < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-writer-core%{?_isa} = 1:3.3.0
 Provides: openoffice.org-writer%{?_isa} = 1:3.3.0, broffice.org-writer%{?_isa} = 1:3.3.0
@@ -532,6 +551,7 @@ Summary: Email mail-merge component for LibreOffice
 Group: Applications/Productivity
 Requires: %{name}-writer = %{epoch}:%{version}-%{release}
 Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org-emailmerge < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-emailmerge%{?_isa} = 1:3.3.0
 %endif
@@ -544,6 +564,8 @@ Summary: LibreOffice Spreadsheet Application
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org-calc-core < 1:3.3.1
+Obsoletes: openoffice.org-calc < 1:3.3.1, broffice.org-calc < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-calc-core%{?_isa} = 1:3.3.0
 Provides: openoffice.org-calc%{?_isa} = 1:3.3.0, broffice.org-calc%{?_isa} = 1:3.3.0
@@ -559,6 +581,8 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-pdfimport = %{epoch}:%{version}-%{release}
 Requires: %{name}-graphicfilter = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org-draw-core < 1:3.3.1
+Obsoletes: openoffice.org-draw < 1:3.3.1, broffice.org-draw < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-draw-core%{?_isa} = 1:3.3.0
 Provides: openoffice.org-draw%{?_isa} = 1:3.3.0, broffice.org-draw%{?_isa} = 1:3.3.0
@@ -574,6 +598,10 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Obsoletes: %{name}-presentation-minimizer < 2:4.2.0.0-1.alpha1
 Obsoletes: %{name}-presenter-screen < 2:4.0.0.0-1.beta1
+Obsoletes: openoffice.org-impress-core < 1:3.3.1
+Obsoletes: openoffice.org-impress < 1:3.3.1, broffice.org-impress < 1:3.3.1
+Obsoletes: openoffice.org-presentation-minimizer < 1:3.3.1
+Obsoletes: openoffice.org-presenter-screen < 1:3.3.1
 Provides: %{name}-presentation-minimizer%{?_isa} = %{epoch}:%{version}-%{release}
 Provides: %{name}-presenter-screen%{?_isa} = %{epoch}:%{version}-%{release}
 %if 0%{?rhel} && 0%{?rhel} < 7
@@ -591,6 +619,8 @@ Summary: LibreOffice Equation Editor Application
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org-math-core < 1:3.3.1
+Obsoletes: openoffice.org-math < 1:3.3.1, broffice.org-math < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-math-core%{?_isa} = 1:3.3.0
 Provides: openoffice.org-math%{?_isa} = 1:3.3.0, broffice.org-math%{?_isa} = 1:3.3.0
@@ -604,6 +634,7 @@ Summary: LibreOffice Extra Graphic filters
 Group: Applications/Productivity
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org-graphicfilter < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-graphicfilter%{?_isa} = 1:3.3.0
 %endif
@@ -616,6 +647,7 @@ flash filters.
 Summary: Optional xsltfilter module for LibreOffice
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org-xsltfilter < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-xsltfilter%{?_isa} = 1:3.3.0
 %endif
@@ -642,6 +674,7 @@ creation and management of PostgreSQL databases through a GUI.
 Summary: UNO Runtime Environment
 Group: Development/Libraries
 Requires: unzip, jre >= 1.5.0
+Obsoletes: openoffice.org-ure < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-ure%{?_isa} = 1:3.3.0
 %endif
@@ -660,6 +693,7 @@ Group: Development/Libraries
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: unzip, java-devel
+Obsoletes: openoffice.org-sdk < 1:3.3.1, openoffice.org-devel < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-sdk%{?_isa} = 1:3.3.0, openoffice.org-devel%{?_isa} = 1:3.3.0
 %endif
@@ -674,6 +708,7 @@ building against the sdk use %{sdkinstdir}/setsdkenv_unix.sh.
 Summary: Software Development Kit documentation for LibreOffice
 Group: Documentation
 Requires: %{name}-sdk = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org-sdk-doc < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-sdk-doc%{?_isa} = 1:3.3.0
 %endif
@@ -687,6 +722,7 @@ Summary: LibreOffice Headless plug-in
 Group: Development/Libraries
 Requires: %{name}-ure = %{epoch}:%{version}-%{release}
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Obsoletes: openoffice.org-headless < 1:3.3.1
 %if 0%{?rhel} && 0%{?rhel} < 7
 Provides: openoffice.org-headless%{?_isa} = 1:3.3.0
 %endif