diff --git a/.cvsignore b/.cvsignore
index 1b785b2..1a53a48 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,3 @@
 clog
-Macaulay2-0.9.10-20060710svn.tar.bz2
-Macaulay2-0.9.20-20060724svn.tar.bz2
 Macaulay2-0.9.20-20060808svn.tar.bz2
+Macaulay2-0.9.95-src.tar.gz
diff --git a/Macaulay2-0.9.8-htmlview.patch b/Macaulay2-0.9.8-htmlview.patch
deleted file mode 100644
index a5d4911..0000000
--- a/Macaulay2-0.9.8-htmlview.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- M2/Macaulay2/bin/M2-help.htmlview	2005-03-13 20:00:26.000000000 -0600
-+++ M2/Macaulay2/bin/M2-help	2006-03-28 08:50:07.000000000 -0600
-@@ -1,2 +1,2 @@
- #! /bin/sh
--${WWBROWSER:-firefox} "$HOME/.Macaulay2/index.html"
-+${WWBROWSER:-htmlview} "$HOME/.Macaulay2/index.html"
diff --git a/Macaulay2-0.9.8-infodir.patch b/Macaulay2-0.9.8-infodir.patch
deleted file mode 100644
index 461187b..0000000
--- a/Macaulay2-0.9.8-infodir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- M2/include/config.Makefile.in.infodir	2006-03-27 13:47:11.000000000 -0600
-+++ M2/include/config.Makefile.in	2006-03-28 07:50:32.000000000 -0600
-@@ -88,8 +88,8 @@
- 
- binRelDir = bin
- libRelDir = lib
--infoRelDir = info
- dataRelDir = share
-+infoRelDir = $(dataRelDir)/info
- manRelDir = $(dataRelDir)/man
- man1RelDir = $(manRelDir)/man1
- man3RelDir = $(manRelDir)/man3
diff --git a/Macaulay2-0.9.95-infodir.patch b/Macaulay2-0.9.95-infodir.patch
new file mode 100644
index 0000000..bd739b0
--- /dev/null
+++ b/Macaulay2-0.9.95-infodir.patch
@@ -0,0 +1,16 @@
+--- Macaulay2-0.9.95/include/config.Makefile.in.infodir	2006-12-18 08:51:43.000000000 -0600
++++ Macaulay2-0.9.95/include/config.Makefile.in	2006-12-18 08:54:13.000000000 -0600
+@@ -141,11 +141,12 @@
+ $(error expected mandir @mandir@ to begin with $(prefix))
+ endif
+ 
+-infoRelDir = $(subst $(prefix)/,,@infodir@)
++#infoRelDir = $(subst $(prefix)/,,@infodir@)
+ binRelDir = $(subst $(prefix)/,,@bindir@)
+ dataRelDir = $(subst $(prefix)/,,@datadir@)
+ libRelDir = $(subst $(prefix)/,,@libdir@)
+ manRelDir = $(subst $(prefix)/,,@mandir@)
++infoRelDir = $(dataRelDir)/info
+ man1RelDir = $(manRelDir)/man1
+ man3RelDir = $(manRelDir)/man3
+ emacsRelDir = $(dataRelDir)/emacs/site-lisp
diff --git a/Macaulay2-0.9.95-xdg_open.patch b/Macaulay2-0.9.95-xdg_open.patch
new file mode 100644
index 0000000..3bf4bae
--- /dev/null
+++ b/Macaulay2-0.9.95-xdg_open.patch
@@ -0,0 +1,6 @@
+--- M2/Macaulay2/bin/M2-help.htmlview	2005-03-13 20:00:26.000000000 -0600
++++ M2/Macaulay2/bin/M2-help	2006-03-28 08:50:07.000000000 -0600
+@@ -1,2 +1,2 @@
+ #! /bin/sh
+-${WWBROWSER:-firefox} "$HOME/.Macaulay2/index.html"
++${WWBROWSER:-xdg-open} "$HOME/.Macaulay2/index.html"
diff --git a/Macaulay2.desktop b/Macaulay2.desktop
index 08855d2..7b71bda 100644
--- a/Macaulay2.desktop
+++ b/Macaulay2.desktop
@@ -5,5 +5,5 @@ Icon=Macaulay2
 SwallowTitle=Macaulay2
 Terminal=true
 Type=Application
-Categories=Application;Education;Math;Scientific;
+Categories=ConsoleOnly;Education;Math;
 Encoding=UTF-8
diff --git a/Macaulay2.spec b/Macaulay2.spec
index e2740ed..4e7b02c 100644
--- a/Macaulay2.spec
+++ b/Macaulay2.spec
@@ -1,19 +1,19 @@
 
-%define beta 20060808svn
+#define beta 20060808svn
 
 %define emacs_sitelisp  %{_datadir}/emacs/site-lisp/
 %define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp/
  
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
-Version: 0.9.20
-Release: 0.4.%{beta}%{?dist}
+Version: 0.9.95
+Release: 1%{?dist}
 
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
-#Source: http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-%{version}.beta.tar.gz
-Source0: Macaulay2-%{version}-%{beta}.tar.bz2
+Source0: http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-%{version}-src.tar.gz
+#Source0: Macaulay2-%{version}-%{beta}.tar.bz2
 Source1: Macaulay2-svn_checkout.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # ppc build currently hangs, never finishes, http://bugzilla.redhat.com/201739
@@ -23,9 +23,9 @@ Source10: Macaulay2.png
 Source11: Macaulay2.desktop
 
 Patch0: Macaulay2-0.9.8-optflags.patch
-Patch1: Macaulay2-0.9.8-htmlview.patch
+Patch1: Macaulay2-0.9.95-xdg_open.patch 
 Patch2: Macaulay2-0.9.10-cout.patch
-Patch3: Macaulay2-0.9.8-infodir.patch
+Patch3: Macaulay2-0.9.95-DESTDIR.patch
 Patch4: Macaulay2-0.9.10-gcc41.patch
 
 BuildRequires: desktop-file-utils
@@ -34,7 +34,7 @@ BuildRequires: ntl-devel
 BuildRequires: factory-devel 
 BuildRequires: libfac-devel 
 BuildRequires: lapack
-%if "%{?fedora}" > "3"
+%if 0%{?fedora} > 3 || 0%{?rhel} > 4
 BuildRequires: lapack-devel
 %endif
 BuildRequires: gdbm-devel
@@ -46,8 +46,6 @@ BuildRequires: info
 # etags
 BuildRequires: emacs-common
 Source20: etags.sh
-# M2-help
-Requires: htmlview
 
 BuildRequires: automake
 
@@ -56,6 +54,11 @@ Provides:  Macaulay2-docs = %{version}-%{release}
 Obsoletes: Macaulay2-emacs < %{version}-%{release}
 Provides:  Macaulay2-emacs = %{version}-%{release}
 
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
+# M2-help
+Requires: xdg-utils
+
 %description
 Macaulay 2 is a new software system devoted to supporting research in
 algebraic geometry and commutative algebra written by Daniel R. Grayson
@@ -68,9 +71,9 @@ and Michael E. Stillman
 install -p -m755 %{SOURCE20} ./etags
 
 %patch0 -p1 -b .optflags
-%patch1 -p1 -b .htmlview
+%patch1 -p1 -b .xdg_open
 %patch2 -p1 -b .cout
-%patch3 -p1 -b .infodir
+%patch3 -p1 -b .DESTDIR
 %patch4 -p1 -b .gcc41
 
 [ -f configure -a -f include/config.h ] || make 
@@ -92,7 +95,7 @@ export PATH=/sbin:`pwd`:$PATH
 make 
 
 
-%check || :
+%check 
 # util/screen dies on fc5/buildsystem (could not open pty)
 #make -k check ||:
 
@@ -100,17 +103,15 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install prefix=$RPM_BUILD_ROOT%{_prefix}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # app img
 install -p -m644 -D %{SOURCE10} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/Macaulay2.png
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --vendor fedora \
-  --add-category "X-Fedora" \
+  --vendor="fedora" \
   %{SOURCE11}
 
 # Make a new home for emacs files
@@ -133,12 +134,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %triggerin -- emacs-common
 if [ -d %{emacs_sitelisp} ]; then 
@@ -163,8 +162,6 @@ fi
 
 %files
 %defattr(-,root,root,-)
-#README awol on latest release.
-#doc Macaulay2/README 
 %doc Macaulay2/CHANGES Macaulay2/COPYING
 %{_bindir}/*
 %{_datadir}/Macaulay2/
@@ -179,6 +176,12 @@ fi
 
 
 %changelog
+* Mon Dec 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.95-1
+- Macaulay2-0.9.95
+
+* Wed Nov 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.20-0.5.20060808svn
+- .desktop Categories: -Application,Scientific,X-Fedora +ConsoleOnly
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.20-0.4.20060808svn
 - fc6 respin
 
diff --git a/sources b/sources
index a5ed52e..3e7f8dc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-7586384990e8151157c32efdd17356f6  Macaulay2-0.9.20-20060724svn.tar.bz2
-322a36e7dc6fc95f5e101d152fed45ee  Macaulay2-0.9.20-20060808svn.tar.bz2
+dbe13387812577b0abfdfa6c54eccecc  Macaulay2-0.9.95-src.tar.gz