diff --git a/pari-2.3.4-xdgopen.patch b/pari-2.3.4-xdgopen.patch
new file mode 100644
index 0000000..d8720c3
--- /dev/null
+++ b/pari-2.3.4-xdgopen.patch
@@ -0,0 +1,13 @@
+--- pari-2.3.4/doc/gphelp.in	2010-05-31 19:39:57.000000000 +0200
++++ pari-2.3.4/doc/gphelp.in	2010-05-31 19:40:20.000000000 +0200
+@@ -47,8 +47,8 @@ $datadir= "@datadir@";
+ # no expanded material (@key@) below
+ $wwwsite= "http://pari.math.u-bordeaux.fr/";
+ 
+-$xdvi = $ENV{GPXDVI} || "xdvi";
+-$xdviref = $ENV{GPXDVIREF} || "$xdvi -paper 29.7x21cm";
++$xdvi = $ENV{GPXDVI} || "xdg-open";
++$xdviref = $ENV{GPXDVIREF} || "$xdvi";
+ $gzip = "gzip";
+ $zcat = "$gzip -dc";
+ $docdir = &get_docdir();
diff --git a/pari.spec b/pari.spec
index 563516c..ab59ee4 100644
--- a/pari.spec
+++ b/pari.spec
@@ -1,13 +1,14 @@
 Name:           pari
 Version:        2.3.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Number Theory-oriented Computer Algebra System
 
 Group:          System Environment/Libraries
 # No version is specified.
 License:        GPL+
-URL:            http://pari.math.u-bordeaux.fr
+URL:            http://pari.math.u-bordeaux.fr/
 Source:		http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.3.4.tar.gz
+Patch0:         pari-2.3.4-xdgopen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	emacs
 BuildRequires:	readline-devel
@@ -16,7 +17,6 @@ BuildRequires:	tetex
 BuildRequires:	tetex-dvips
 BuildRequires:  desktop-file-utils
 BuildRequires:	libX11-devel
-Requires:	tetex-xdvi
 
 
 %description
@@ -44,6 +44,8 @@ Header files and libraries for PARI development.
 Summary:	PARI calculator
 Group:		Applications/Engineering
 Requires:	gzip
+Requires:       xdg-utils
+Requires:       mimehandler(application/x-dvi)
 
 %description gp
 PARI/GP is an advanced programmable calculator, which computes
@@ -63,6 +65,10 @@ Emacs mode for PARI/GP.
 
 %prep
 %setup -q
+
+# Use xdg-open rather than xdvi to display DVI files (#530565)
+%patch0 -p1 -b .xdgopen
+
 sed -i "s|runpathprefix='.*'|runpathprefix=''|" config/get_ld
 
 
@@ -163,6 +169,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul  7 2010 Paul Howarth <paul@city-fan.org> - 2.3.4-4
+- apply patch from Patrice Dumas to use xdg-open rather than xdvi to display
+  DVI content, and move the xdg-open requirement from the main package to the
+  gp sub-package (#530565)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild