diff --git a/pango.spec b/pango.spec
index 5488097..6ea4459 100644
--- a/pango.spec
+++ b/pango.spec
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text.
 Name: pango
 Version: 1.4.0
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.4/pango-%{version}.tar.bz2
@@ -77,6 +77,29 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# Deriving /etc/pango/$host location
+# NOTE: Duplicated below
+#
+# autoconf changes linux to linux-gnu
+case "%{_host}" in
+  *linux) host="%{_host}-gnu"
+  ;;
+  *) host="%{_host}"
+  ;;
+esac
+
+# autoconf uses powerpc not ppc
+host=`echo $host | sed "s/^ppc/powerpc/"`
+
+# Make sure that the host value that is passed to the compile 
+# is the same as the host that we're using in the spec file
+#
+compile_host=`grep 'host_triplet =' pango/Makefile | sed "s/.* = //"`
+
+if test "x$compile_host" != "x$host" ; then
+  echo 1>&2 "Host mismatch: compile='$compile_host', spec file='$host'" && exit 1
+fi
+
 %makeinstall
 
 # Remove files that should not be packaged
@@ -89,14 +112,6 @@ if ! test -e $PANGOXFT_SO; then
         exit 1
 fi      
 
-# autoconf changes linux to linux-gnu
-case "%{_host}" in
-  *linux) host="%{_host}-gnu" 
-  ;;
-  *) host="%{_host}"
-  ;;
-esac
-
 # We need to have separate 32-bit and 64-bit pango-querymodules binaries
 # for places where we have two copies of the Pango libraries installed.
 # (we might have x86_64 and i686 packages on the same system, for example.)
@@ -125,16 +140,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
+
+# Deriving /etc/pango/$host location
+#
 # autoconf changes linux to linux-gnu
 case "%{_host}" in
-  *linux) host="%{_host}-gnu" 
+  *linux) host="%{_host}-gnu"
   ;;
   *) host="%{_host}"
   ;;
 esac
 
+# autoconf uses powerpc not ppc
+host=`echo $host | sed "s/^ppc/powerpc/"`
+
 case "$host" in
-  alpha*|ia64*|ppc64*|s390x*|x86_64*)
+  alpha*|ia64*|powerpc64*|s390x*|x86_64*)
    %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/$host/pango.modules
    ;;
   *)
@@ -166,6 +187,10 @@ esac
 
 
 %changelog
+* Wed Mar 17 2004 Owen Taylor <otaylor@redhat.com> 1.4.0-2
+- Fix location for modules file on ppc/ppc64 (#114399)
+- Make the spec file check to avoid further mismatches
+
 * Wed Mar 17 2004 Alex Larsson <alexl@redhat.com> 1.4.0-1
 - update to 1.4.0