diff --git a/conflicts.patch b/conflicts.patch
new file mode 100644
index 0000000..0410cb9
--- /dev/null
+++ b/conflicts.patch
@@ -0,0 +1,29 @@
+diff -up pkg-config-0.22/pkg.c.conflicts pkg-config-0.22/pkg.c
+--- pkg-config-0.22/pkg.c.conflicts	2007-11-15 23:56:26.000000000 -0500
++++ pkg-config-0.22/pkg.c	2007-11-15 23:57:26.000000000 -0500
+@@ -821,7 +821,7 @@ verify_package (Package *pkg)
+    */
+   
+   recursive_fill_list (pkg, get_requires_private, &requires);
+-  recursive_fill_list (pkg, get_conflicts, &conflicts);
++  conflicts = get_conflicts (pkg);
+ 
+   requires_iter = requires;
+   while (requires_iter != NULL)
+@@ -843,7 +843,7 @@ verify_package (Package *pkg)
+                              req->version, req->name,
+                              ver->name,
+                              comparison_to_str (ver->comparison),
+-                             ver->version,
++                             ver->version ? ver->version : "(any)",
+                              ver->owner->name,
+                              ver->owner->version);
+ 
+@@ -857,7 +857,6 @@ verify_package (Package *pkg)
+     }
+   
+   g_slist_free (requires);
+-  g_slist_free (conflicts);
+ 
+   /* We make a list of system directories that gcc expects so we can remove
+    * them.
diff --git a/pkgconfig.spec b/pkgconfig.spec
index f8eeb4e..6b18e2a 100644
--- a/pkgconfig.spec
+++ b/pkgconfig.spec
@@ -1,7 +1,7 @@
 Summary: A tool for determining compilation options
 Name: pkgconfig
 Version: 0.22
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://pkgconfig.freedesktop.org
@@ -13,6 +13,8 @@ Patch1:  pkgconfig-0.15.0-reqprov.patch
 Patch2:  pkg-config-0.21-compat-loop.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=4738
 Patch3:  pkg-config-0.21-requires-private-fix.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=13265
+Patch4:  conflicts.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -26,6 +28,7 @@ compiler and linker flags.
 %patch1 -p1 -b .reqprov
 %patch2 -p1 -b .compat-loop
 %patch3 -p1 -b .requires-private-fix
+%patch4 -p1 -b .conflicts
 
 %build
 %configure --disable-shared --with-pc-path=%{_libdir}/pkgconfig:%{_datadir}/pkgconfig
@@ -50,7 +53,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 
 %changelog
-* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1:0.22-3
+* Thu Nov 15 2007 Matthias Clasen <mclasen@redhat.com> - 1:0.22-4
+- Fix handling of conflicts (#384421)
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1:0.22-3
 - Rebuild for selinux ppc32 issue.
 
 * Tue Aug  7 2007 Matthias Clasen <mclasen@redhat.com> - 1:0.22-2