diff --git a/libuna.spec b/libuna.spec
index 1e89920..1432f65 100644
--- a/libuna.spec
+++ b/libuna.spec
@@ -16,8 +16,15 @@
 #
 
 
+%if "@BUILD_FLAVOR@" != ""
+%define pprefix @BUILD_FLAVOR@-
+%define psuffix -@BUILD_FLAVOR@
+%else
+%define psuffix %nil
+%endif
+%define lname libuna1
+
 Name:           libuna
-%define lname	libuna1
 Version:        20210418
 Release:        0
 Summary:        Library to support Unicode and ASCII (byte string) conversions
@@ -31,7 +38,7 @@ BuildRequires:  gettext-tools >= 0.18.1
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(libcdatetime) >= 20200510
-BuildRequires:  pkgconfig(libcerror) >= 20150101
+BuildRequires:  pkgconfig(libcerror) >= 20201121
 %if "@BUILD_FLAVOR@" != "mini"
 BuildRequires:  pkgconfig(libcfile) >= 20201229
 %endif
@@ -44,11 +51,14 @@ conversions. It currently supports: 7-bit ASCII, ISO 8859-{1..15},
 Windows 874, 932, 936, 949, 950, 1250, 1251, 1252, 1253, 1254, 1255,
 1256, 1257, 1258, KOI8-R, KOI8-U, UTF-7, UTF-8, UTF-16, UTF-32.
 
-%package -n %lname
+%package -n %lname%psuffix
 Summary:        Library to support Unicode and ASCII (byte string) conversions
 Group:          System/Libraries
+%if "@BUILD_FLAVOR@" == ""
+Obsoletes:      %lname-mini
+%endif
 
-%description -n %lname
+%description -n %lname%psuffix
 libuna is a library to support Unicode and ASCII (byte string)
 conversions.
 
@@ -59,12 +69,15 @@ Group:          Development/Tools/Other
 %description tools
 Several tools for converting Unicode and ASCII (byte stream) based text.
 
-%package devel
+%package %{?pprefix}devel
 Summary:        Development files for libuna, a library to support Unicode/ASCII conversions
 Group:          Development/Libraries/C and C++
-Requires:       %lname = %{version}
+Requires:       %lname%psuffix = %version
+%if "@BUILD_FLAVOR@" == ""
+Obsoletes:      libuna-devel-mini
+%endif
 
-%description devel
+%description %{?pprefix}devel
 libuna is a library to support Unicode and ASCII (byte string)
 conversions.
 
@@ -87,10 +100,10 @@ if [ ! -e configure ]; then ./autogen.sh; fi
 %make_install
 rm -f "%{buildroot}/%{_libdir}"/*.la
 
-%post   -n %lname -p /sbin/ldconfig
-%postun -n %lname -p /sbin/ldconfig
+%post   -n %lname%psuffix -p /sbin/ldconfig
+%postun -n %lname%psuffix -p /sbin/ldconfig
 
-%files -n %lname
+%files -n %lname%psuffix
 %license COPYING
 %{_libdir}/libuna.so.1*
 
@@ -100,7 +113,7 @@ rm -f "%{buildroot}/%{_libdir}"/*.la
 %{_mandir}/man1/unaexport.1*
 %endif
 
-%files devel
+%files %{?pprefix}devel
 %{_includedir}/libuna*
 %{_libdir}/libuna.so
 %{_libdir}/pkgconfig/libuna.pc