diff --git a/brlapi-config.h b/brlapi-config.h
new file mode 100644
index 0000000..c369b45
--- /dev/null
+++ b/brlapi-config.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "config-32.h"
+#elif __WORDSIZE == 64
+#include "config-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/brlapi-forbuild.h b/brlapi-forbuild.h
new file mode 100644
index 0000000..4f5093e
--- /dev/null
+++ b/brlapi-forbuild.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "forbuild-32.h"
+#elif __WORDSIZE == 64
+#include "forbuild-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/brltty.spec b/brltty.spec
index 63f1653..cb68e1b 100644
--- a/brltty.spec
+++ b/brltty.spec
@@ -33,11 +33,13 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 URL: http://brltty.app/
 Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz
 Source1: brltty.service
+Source2: brlapi-config.h
+Source3: brlapi-forbuild.h
 Patch1: brltty-6.3-loadLibrary.patch
 # libspeechd.h moved in latest speech-dispatch (NOT sent upstream)
 Patch2: brltty-6.3-libspeechd.patch
@@ -411,6 +413,16 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop
 # make brltty-config executable
 chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/brltty-config.sh
 
+# fix multilib
+pushd %{buildroot}%{_includedir}/brltty
+for f in config forbuild
+do
+  mv ./$f.h ./$f-$(getconf LONG_BIT).h
+done
+install -p -m 0644 %{SOURCE2} ./config.h
+install -p -m 0644 %{SOURCE3} ./forbuild.h
+popd
+
 # handle locales
 %find_lang %{name}
 cp -p %{name}.lang ../
@@ -549,6 +561,10 @@ fi
 %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty/Initramfs/cmdline
 
 %changelog
+* Tue Jun 22 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 6.3-3
+- Fixed brlapi multilib
+  Resolves: rhbz#1915335
+
 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 6.3-2
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937