diff --git a/gpg2.changes b/gpg2.changes
index 8ca3050..990df12 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 14 15:14:44 CET 2007 - ltinkl@suse.cz
+
+- fix file conflicts with gpg (#242133)
+
 -------------------------------------------------------------------
 Tue Jan 30 00:34:50 CET 2007 - ro@suse.de
 
diff --git a/gpg2.spec b/gpg2.spec
index f802031..d523ae5 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -22,7 +22,7 @@ Provides:       newpg
 Obsoletes:      newpg
 Summary:        GnuPG 2
 Version:        2.0.1rc1
-Release:        2
+Release:        5
 Source:         gnupg-%{version}.tar.bz2
 %define nld_build 0
 Patch2:         nld-build.diff
@@ -83,6 +83,8 @@ make
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 rm $RPM_BUILD_ROOT/usr/share/info/dir
+rm $RPM_BUILD_ROOT/usr/share/gnupg/FAQ
+rm $RPM_BUILD_ROOT/usr/share/gnupg/faq.html
 
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz
@@ -92,7 +94,7 @@ rm $RPM_BUILD_ROOT/usr/share/info/dir
 
 %files
 %defattr(-,root,root)
-%doc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO VERSION
+%doc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO VERSION doc/FAQ doc/faq.html
 %doc %_infodir/gnupg*
 %doc %{_mandir}/*/*.gz
 /usr/bin/*
@@ -102,6 +104,8 @@ rm $RPM_BUILD_ROOT/usr/share/info/dir
 /usr/share/gnupg
 
 %changelog -n gpg2
+* Wed Feb 14 2007 - ltinkl@suse.cz
+- fix file conflicts with gpg (#242133)
 * Tue Jan 30 2007 - ro@suse.de
 - fix build (exclude possible debuginfo directory)
 * Mon Jan 29 2007 - ltinkl@suse.cz