diff --git a/SPECS/libvisual.spec b/SPECS/libvisual.spec
index 8292b11..f149527 100644
--- a/SPECS/libvisual.spec
+++ b/SPECS/libvisual.spec
@@ -2,7 +2,7 @@
 
 Name:           libvisual
 Version:        0.4.0
-Release:        24%{?dist}
+Release:        25%{?dist}
 Epoch:		1
 Summary:        Abstraction library for audio visualisation plugins
 Group:          Applications/Multimedia
@@ -54,6 +54,44 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot}
+
+# Avoid multilib conflicts
+case `uname -i` in
+  i386 | ppc | s390 | sparc )
+    wordsize="32"
+    ;;
+  x86_64 | ppc64 | s390x | sparc64 )
+    wordsize="64"
+    ;;
+  *)
+    wordsize=""
+    ;;
+esac
+
+if test -n "$wordsize"
+then
+  mv %{buildroot}%{_includedir}/libvisual-%{smallversion}/libvisual/lvconfig.h \
+     %{buildroot}%{_includedir}/libvisual-%{smallversion}/libvisual/lvconfig-$wordsize.h
+
+  cat >%{buildroot}%{_includedir}/libvisual-%{smallversion}/libvisual/lvconfig.h <<EOF
+#ifndef __LV_CONFIG_H_MULTILIB__
+#define __LV_CONFIG_H_MULTILIB__
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include "lvconfig-32.h"
+#elif __WORDSIZE == 64
+# include "lvconfig-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
+EOF
+
+fi
+
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
 %find_lang %{name}-%{smallversion}
@@ -75,6 +113,10 @@ find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 
 
 %changelog
+* Fri Jan 15 2021 Kalev Lember <klember@redhat.com> - 1:0.4.0-25
+- Fix multilib conflicts in lvconfig.h
+- Resolves: #1853155
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.4.0-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild