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 da22414..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xdvik
-# $Id$
-NAME := xdvik
-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),)
-# attept 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/texlive-2007-xprint.patch b/texlive-2007-xprint.patch
deleted file mode 100644
index 9d28e89..0000000
--- a/texlive-2007-xprint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- tetex-src-3.0/texk/xdvik/configure.in.xprint	2006-05-05 16:31:52.000000000 -0400
-+++ tetex-src-3.0/texk/xdvik/configure.in	2006-05-05 16:32:07.000000000 -0400
-@@ -105,8 +105,8 @@
-   else
-     XLFLAG=
-   fi
--  AC_CHECK_LIB(Xp, XpQueryVersion,
--               x_ext_lib="-lXp -lXext", :, -lXext -lX11 $X_EXTRA_LIBS $XLFLAG)
-+#  AC_CHECK_LIB(Xp, XpQueryVersion,
-+#               x_ext_lib="-lXp -lXext", :, -lXext -lX11 $X_EXTRA_LIBS $XLFLAG)
- fi
- dnl
- dnl If libXp not found, try libXext only:
diff --git a/xdvik-22.84.14-zerofix.patch b/xdvik-22.84.14-zerofix.patch
new file mode 100644
index 0000000..3345a0f
--- /dev/null
+++ b/xdvik-22.84.14-zerofix.patch
@@ -0,0 +1,10 @@
+diff -up xdvik-22.84.14/texk/xdvik/texmf/XDvi.zerofix xdvik-22.84.14/texk/xdvik/texmf/XDvi
+--- xdvik-22.84.14/texk/xdvik/texmf/XDvi.zerofix	2008-11-12 00:09:46.000000000 +0000
++++ xdvik-22.84.14/texk/xdvik/texmf/XDvi	2008-11-12 00:10:02.000000000 +0000
+@@ -368,3 +368,6 @@ Ctrl<Btn5Down>:set-shrink-factor(-)\n\
+ !!!-------------- used for internal checking - DO NOT CHANGE THIS! --------------
+ !!!------------------------------------------------------------------------------
+ *appDefaultsFileVersion: 20030303
++
++*mainTranslations: #override\n\
++	<Key>0: digit(0)
diff --git a/xdvik.spec b/xdvik.spec
index 8577130..032a47d 100644
--- a/xdvik.spec
+++ b/xdvik.spec
@@ -7,7 +7,7 @@
 Summary:        An X viewer for DVI files
 Name:           xdvik
 Version:        22.84.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Url:            http://xdvi.sourceforge.net/
 # encodings.c is GPLv2+ and LGPL and MIT
 # read-mapfile.c tfmload.c are from dvips
@@ -41,8 +41,11 @@ Source30:       xdvi48x48.png
 Source100:      xdvi-ptex.map
 %endif
 
-# This patch not pushed upstream. Unclear if it's actually still needed.
-Patch1:         texlive-2007-xprint.patch
+# Fix handling of the 0 key. See:
+# http://sourceforge.net/tracker/index.php?func=detail&aid=2067614&group_id=23164&atid=377580
+# https://bugzilla.redhat.com/show_bug.cgi?id=470942
+# Fixed upstream post 22.84.14 ?
+Patch0:		xdvik-22.84.14-zerofix.patch
 
 %if %{with japanese}
 # Japanese patch for xdvi from http://sourceforge.jp/projects/xdvi/
@@ -71,6 +74,9 @@ formatting package which provides an easier-to-use interface for TeX).
 %prep
 %setup -q
 
+# Fix handling of zero key
+%patch0 -p1 -b .zerofix
+
 # Allow Xaw3d enabled build of xdvi
 sed -i 's|/Xaw/|/Xaw3d/|' texk/xdvik/gui/*.[ch] texk/xdvik/*.[ch]
 
@@ -239,6 +245,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Nov 12 2008 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 22.84.14-4
+- Add patch to fix zero key handling (BZ 470942)
+- Remove texlive-2007-xprint.patch which actually hasn't been applied during
+  22.84.14 packaging
+
 * Sun Oct 12 2008 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 22.84.14-3
 - Fix package build breakage