diff --git a/pkg-config-0.18.1-free.patch b/pkg-config-0.18.1-free.patch
new file mode 100644
index 0000000..b6ba520
--- /dev/null
+++ b/pkg-config-0.18.1-free.patch
@@ -0,0 +1,21 @@
+--- pkg-config-0.18.1/pkg.c.free	2005-08-09 16:21:57.964630000 -0400
++++ pkg-config-0.18.1/pkg.c	2005-08-09 16:22:07.295289000 -0400
+@@ -1200,7 +1200,7 @@
+   char *varval = NULL;
+ 
+   if (globals)
+-    varval = g_hash_table_lookup (globals, var);
++    varval = g_strdup(g_hash_table_lookup (globals, var));
+   
+   if (varval == NULL && pkg->vars)
+     varval = g_strdup (g_hash_table_lookup (pkg->vars, var));
+@@ -1241,7 +1241,8 @@
+     }
+ 
+   /* chop last space */
+-  str->str[str->len - 1] = '\0';
++  if (str->len)
++     str->str[str->len - 1] = '\0';
+   retval = str->str;
+   g_string_free (str, FALSE);
+ 
diff --git a/pkgconfig.spec b/pkgconfig.spec
index b039d3f..87cd17f 100644
--- a/pkgconfig.spec
+++ b/pkgconfig.spec
@@ -1,7 +1,7 @@
 Summary: A tool for determining compilation options.
 Name: pkgconfig
 Version: 0.18.1
-Release: 3
+Release: 4
 Epoch: 1
 License: GPL
 Group: Development/Tools
@@ -9,6 +9,7 @@ Source:  http://www.freedesktop.org/software/pkgconfig/releases/pkg-config-%{ver
 # https://bugs.freedesktop.org/show_bug.cgi?id=2661 
 Patch4:  pkgconfig-0.15.0-overflow.patch
 Patch5:  pkgconfig-0.15.0-reqprov.patch
+Patch6:  pkgconfig-0.18.1-free.patch
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
@@ -20,6 +21,7 @@ compiler and linker flags.
 %setup -n pkg-config-%{version} -q
 %patch4 -p1 -b .overflow
 %patch5 -p1 -b .reqprov
+%patch6 -p1 -b .free
 autoheader
 autoconf
 automake-1.7
@@ -45,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Aug  9 2005 Matthias Clasen <mclasen@redhat.com> 1:0.18.1-4
+- Fix a segfault which curiously hits only bigendian platforms
+
 * Sun Jul 11 2005 Matthias Clasen <mclasen@redhat.com> 1:0.18.1-3
 - Remove unncessary dependencies