diff --git a/libpango.spec b/libpango.spec
index 6547ee8..e0c3f2e 100644
--- a/libpango.spec
+++ b/libpango.spec
@@ -4,7 +4,7 @@
 
 Name:          libpango
 Version:       1.36.8
-Release:       1mamba
+Release:       2mamba
 Summary:       System for layout and rendering of internationalized text
 Group:         System/Internationalization
 Vendor:        openmamba
@@ -78,9 +78,11 @@ Requires:      gtk-doc
 
 %build
 %configure \
+   --program-suffix=-%{_target_cpu} \
 %if "%{stage1}" == "1"
    --enable-introspection=no
 %endif
+
 # --enable-gtk-doc warning: failed to load external entity "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl
 %make
 
@@ -98,14 +100,26 @@ install -d -m0755 %{buildroot}%{_sysconfdir}/pango
 
 %posttrans
 /sbin/ldconfig
-%{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules
+%ifarch %{ix86}
+if [ -e %{_bindir}/pango-querymodules-x86_64 ]; then
+   mkdir %{_sysconfdir}/pango/i686-pc-linux-gnu
+   %{_bindir}/pango-querymodules-%{_target_cpu} > %{_sysconfdir}/pango/i686-pc-linux-gnu/pango.modules
+else
+%endif
+%{_bindir}/pango-querymodules-%{_target_cpu} > %{_sysconfdir}/pango/pango.modules
+ln -snf pango-querymodules-%{_target_cpu} %{_bindir}/pango-querymodules
+ln -snf pango-view-%{_target_cpu} %{_bindir}/pango-view
+%ifarch %{ix86}
+fi
+%else
+%endif
 exit 0
 
 %files
 %defattr(-,root,root)
 %dir %{_sysconfdir}/pango
-%{_bindir}/pango-querymodules
-%{_bindir}/pango-view
+%{_bindir}/pango-querymodules-%{_target_cpu}
+%{_bindir}/pango-view-%{_target_cpu}
 %{_libdir}/libpango-%{libver}.so.*
 %{_libdir}/libpangocairo-%{libver}.so.*
 %{_libdir}/libpangoft2-%{libver}.so.*
@@ -116,8 +130,8 @@ exit 0
 %if "%{stage1}" != "1"
 %{_libdir}/girepository-1.0/Pango*.typelib
 %endif
-%{_mandir}/man1/pango-querymodules.1.gz
-%{_mandir}/man1/pango-view.1.gz
+%{_mandir}/man1/pango-querymodules-%{_target_cpu}.1*
+%{_mandir}/man1/pango-view-%{_target_cpu}.1*
 #%{_mandir}/man1/preload.1.gz
 %doc AUTHORS ChangeLog
 
@@ -142,6 +156,9 @@ exit 0
 %{_datadir}/gtk-doc/html/pango/*
 
 %changelog
+* Thu Mar 26 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.36.8-2mamba
+- executable and configuration support for biarch environment
+
 * Mon Sep 22 2014 Automatic Build System <autodist@mambasoft.it> 1.36.8-1mamba
 - automatic version update by autodist