diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 5303fca30..a0522c7b6 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,9 +1,14 @@
-2006-10-15  Leonard den Ottolander <leonard den ottolander nl>
+2006-11-01  Jindrich Novy  <jnovy@redhat.com>
+
+	* extfs/rpm: Recognize CONFLICTS.
+	* extfs/trpm: Likewise.
+
+2006-10-15  Leonard den Ottolander  <leonard den ottolander nl>
 
 	* utilvfs.c (is_year): Revert range of valid years to 1900 - 3000 as
 	parsing has been fixed.
 
-2006-08-01  Leonard den Ottolander <leonard den ottolander nl>
+2006-08-01  Leonard den Ottolander  <leonard den ottolander nl>
 
 	* extfs/rpm: Restore legacy RPM tags. There's no harm in keeping them
 	around for backward compatibility.
@@ -39,7 +44,7 @@
 	* extfs/rpm: Remove support for obsoleted RPM tags.
 	* extfs/trpm: Likewise.
 
-2006-05-28  Leonard den Ottolander <leonard den ottolander nl>
+2006-05-28  Leonard den Ottolander  <leonard den ottolander nl>
 
 	* extfs/mailfs.in (parse_date): Output 3 date fields not 4. Range to
 	output time not year is slightly larger than the range used by
diff --git a/vfs/extfs/rpm b/vfs/extfs/rpm
index 0ad740ba4..08d62c285 100644
--- a/vfs/extfs/rpm
+++ b/vfs/extfs/rpm
@@ -122,12 +122,15 @@ mcrpmfs_list ()
 	echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
     $RPM -qp --qf "[%{PROVIDES}\n]" "$f" | grep "(none)" > /dev/null ||
 	echo "$FILEPREF 0 $DATE INFO/PROVIDES"
+    $RPM -qp --qf "[%{CONFLICTS}\n]" "$f" | grep "(none)" > /dev/null ||
+	echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
     test "`$RPM -qp --qf \"%{CHANGELOGTEXT}\" \"$f\"`" = "(none)" ||
        echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
     else 
 	echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
 	echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
 	echo "$FILEPREF 0 $DATE INFO/PROVIDES"
+	echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
         echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
     fi
 
@@ -171,6 +174,7 @@ mcrpmfs_copyout ()
 	INFO/CHANGELOG)		$RPM -qp --qf "[* %{CHANGELOGTIME:date} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]\n" "$f" > "$3"; exit 0;;
 	INFO/SIZE)		$RPM -qp --qf "%{SIZE} bytes\n" "$f" > "$3"; exit 0;;
 	INFO/OBSOLETES)		$RPM -qp --qf "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" "$f" > "$3"; exit 0;;
+	INFO/CONFLICTS)		$RPM -qp --qf "[%{CONFLICTNAME} %{CONFLICTFLAGS:depflags} %{CONFLICTVERSION}\n]" "$f" >"$3"; exit 0;;
 	CONTENTS.cpio)		$RPM2CPIO "$1" > "$3"; exit 0;;
 	*)
 	    ;;
diff --git a/vfs/extfs/trpm b/vfs/extfs/trpm
index 463ab6464..9900d1b10 100644
--- a/vfs/extfs/trpm
+++ b/vfs/extfs/trpm
@@ -112,12 +112,15 @@ mcrpmfs_list ()
 	echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
     $RPM -q --qf "[%{PROVIDES}\n]" -- "$1" | grep "(none)" > /dev/null ||
 	echo "$FILEPREF 0 $DATE INFO/PROVIDES"
+    $RPM -q --qf "[%{CONFLICTS}\n]" -- "$1" | grep "(none)" > /dev/null ||
+	echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
     test "`$RPM -q --qf \"%{CHANGELOGTEXT}\" -- "$1"`" = "(none)" ||
        echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
     else 
 	echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
 	echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
 	echo "$FILEPREF 0 $DATE INFO/PROVIDES"
+	echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
         echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
     fi
 
@@ -148,6 +151,7 @@ mcrpmfs_copyout ()
 	INFO/REQUIRENAME)	$RPM -q --qf "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" -- "$1" > "$3"; exit 0;;
 	INFO/OBSOLETES)		$RPM -q --qf "[%{OBSOLETENAME} %|OBSOLETEFLAGS?{%{OBSOLETEFLAGS:depflags} %{OBSOLETEVERSION}}:{}|\n]" -- "$1" > "$3"; exit 0;;
 	INFO/PROVIDES)		$RPM -q --qf "[%{PROVIDES}\n]" -- "$1" > "$3"; exit 0;;
+	INFO/CONFLICTS)		$RPM -q --qf "[%{CONFLICTS}\n]" -- "$1" > "$3"; exit 0;;
 	INFO/SCRIPTS/PREIN)	$RPM -q --qf "%{RPMTAG_PREIN}\n" -- "$1" > "$3"; exit 0;;
 	INFO/SCRIPTS/POSTIN)	$RPM -q --qf "%{RPMTAG_POSTIN}\n" -- "$1" > "$3"; exit 0;;
 	INFO/SCRIPTS/PREUN)	$RPM -q --qf "%{RPMTAG_PREUN}\n" -- "$1" > "$3"; exit 0;;