diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index dddfed6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xfig
-# $Id: Makefile,v 1.1 2004/09/09 14:43:45 cvsdist Exp $
-NAME := xfig
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/xfig-3.2.5a-default-apps.patch b/xfig-3.2.5a-default-apps.patch
index 903f9cd..4c31e60 100644
--- a/xfig-3.2.5a-default-apps.patch
+++ b/xfig-3.2.5a-default-apps.patch
@@ -1,12 +1,7 @@
 diff -up xfig.3.2.5a/Fig.ad~ xfig.3.2.5a/Fig.ad
 --- xfig.3.2.5a/Fig.ad~	2007-04-14 04:17:24.000000000 +0200
 +++ xfig.3.2.5a/Fig.ad	2009-03-27 15:15:27.000000000 +0100
-@@ -19,22 +19,20 @@ Fig*AllowShellResize: false
- Fig.image_editor:		xv
- 
- ! name of ghostscript (not ghostview)
--Fig.ghostscript:		gs
-+Fig.ghostscript:		xdg-open
+@@ -23,18 +23,16 @@ Fig*AllowShellResize: false
  
  ! Browser - put your favorite browser here.  
  ! 		This is for viewing the xfig html reference.
diff --git a/xfig.spec b/xfig.spec
index bca217c..ca42c05 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -3,7 +3,7 @@
 Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
 Version: 3.2.5
-Release: 19.a%{?dist}
+Release: 20.a%{?dist}
 License: MIT
 Group: Applications/Multimedia
 URL: http://www.xfig.org/
@@ -47,8 +47,6 @@ BuildRequires: desktop-file-utils
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# for xrdb for merging of the color resources
-Requires: xorg-x11-server-utils
 Requires: %{name}-common = %{version}-%{release}
 Provides: %{name}-executable = %{version}-%{release}
 # Xaw3d used to be the one in a subpackage, now the plain Xaw version is
@@ -84,9 +82,12 @@ version you probably don't want this version.
 Summary:        Common xfig files
 Group:          Applications/Multimedia
 Requires:       transfig >= 1:3.2.5, xdg-utils, aspell, urw-fonts
+Requires:       hicolor-icon-theme
 Requires:       xorg-x11-fonts-base
 # So that this will get uninstalled together with xfig / xfig-Xaw3d
 Requires:       %{name}-executable = %{version}-%{release}
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 %description common
 Files common to both the plain Xaw and the Xaw3d version of xfig.
@@ -135,6 +136,8 @@ rm -rf %{buildroot}
 
 make DESTDIR=%{buildroot} XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
      INSTALL="install -p" install.all
+install -p -m 644 CHANGES README LATEX.AND.XFIG* FIGAPPS \
+  %{buildroot}%{_docdir}/%{name}-%{version}
 
 # install the Xaw3d version and the wrapper for the .desktop file
 mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-plain
@@ -196,6 +199,9 @@ fi
 
 
 %changelog
+* Wed Jun  3 2009 Hans de Goede <hdegoede@redhat.com> 3.2.5-20.a
+- Fix eps preview (#503911)
+
 * Wed Apr  8 2009 Hans de Goede <hdegoede@redhat.com> 3.2.5-19.a
 - Fix crash when printing (#494193), thanks to Ian Dall for the patch