diff --git a/pinfo-0.6.8-htmlview.patch b/pinfo-0.6.8-htmlview.patch
deleted file mode 100644
index cda3db5..0000000
--- a/pinfo-0.6.8-htmlview.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- pinfo-0.6.8/src/pinforc.in.links	2004-09-26 17:39:33.000000000 -0400
-+++ pinfo-0.6.8/src/pinforc.in	2004-09-26 17:39:58.000000000 -0400
-@@ -85,8 +85,8 @@
- CLEAR-SCREEN-AT-EXIT=true
- CALL-READLINE-HISTORY=true
- STDERR-REDIRECTION="2> /dev/null"
--HTTPVIEWER=lynx
--FTPVIEWER=lynx
-+HTTPVIEWER=htmlview
-+FTPVIEWER=htmlview
- MAILEDITOR=clear; mail
- PRINTUTILITY=lpr
- MANLINKS=1:8:2:3:4:5:6:7:9:n:p:o:3X11:3Xt:3x:3X
diff --git a/pinfo-0.6.9-xdg.patch b/pinfo-0.6.9-xdg.patch
new file mode 100644
index 0000000..18f7e3d
--- /dev/null
+++ b/pinfo-0.6.9-xdg.patch
@@ -0,0 +1,16 @@
+diff -up pinfo-0.6.9/src/pinforc.in.xdg pinfo-0.6.9/src/pinforc.in
+--- pinfo-0.6.9/src/pinforc.in.xdg	2006-03-09 20:44:37.000000000 +0100
++++ pinfo-0.6.9/src/pinforc.in	2007-10-03 18:35:21.000000000 +0200
+@@ -85,9 +85,9 @@ QUIT-CONFIRM-DEFAULT=no
+ CLEAR-SCREEN-AT-EXIT=true
+ CALL-READLINE-HISTORY=true
+ STDERR-REDIRECTION="2> /dev/null"
+-HTTPVIEWER=lynx
+-FTPVIEWER=lynx
+-MAILEDITOR=clear; mail
++HTTPVIEWER=xdg-open
++FTPVIEWER=xdg-open
++MAILEDITOR=xdg-email
+ PRINTUTILITY=lpr
+ MANLINKS=1:8:2:3:4:5:6:7:9:n:p:o:3X11:3Xt:3x:3X
+ SAFE-USER=nobody
diff --git a/pinfo.spec b/pinfo.spec
index 9abc566..bd07717 100644
--- a/pinfo.spec
+++ b/pinfo.spec
@@ -1,19 +1,19 @@
 Summary: An info file viewer
 Name: pinfo
 Version: 0.6.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Base
 License: GPLv2
 URL: http://pinfo.alioth.debian.org
 Source: pinfo-%{version}.tar.bz2
-Patch1: pinfo-0.6.8-htmlview.patch
+Patch1: pinfo-0.6.9-xdg.patch
 Patch2: pinfo-0.6.9-infosuff.patch
 Patch3: pinfo-0.6.9-nogroup.patch
 Patch4: pinfo-0.6.9-mansection.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ncurses-devel
-Requires: htmlview
+Requires: xdg-utils
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -24,7 +24,7 @@ using regular expressions, and is based on the ncurses library.
 
 %prep
 %setup -q
-%patch1 -p1 -b .links
+%patch1 -p1 -b .xdg
 %patch2 -p1 -b .infosuff
 %patch3 -p1 -b .nogroup
 %patch4 -p1 -b .mansection
@@ -70,6 +70,9 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Oct 03 2007 Miroslav Lichvar <mlichvar@redhat.com> 0.6.9-5
+- use xdg-utils instead of htmlview (#312471)
+
 * Wed Aug 22 2007 Miroslav Lichvar <mlichvar@redhat.com> 0.6.9-4
 - update license tag