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/xdvik.spec b/xdvik.spec
index f4ec3a8..c3f1aa8 100644
--- a/xdvik.spec
+++ b/xdvik.spec
@@ -8,7 +8,7 @@
 Summary:        An X viewer for DVI files
 Name:           xdvik
 Version:        22.84.13
-Release:        17%{?dist}
+Release:        17%{?dist}.1
 Url:            http://xdvi.sourceforge.net/
 # encodings.c is GPLv2+ and LGPL and MIT
 # read-mapfile.c tfmload.c are from dvips
@@ -19,7 +19,7 @@ Obsoletes:      tetex-xdvi < 3.0-99
 Provides:       tetex-xdvi = 3.0-99
 Provides:       xdvi = %{version}-%{release}
 Obsoletes:      xdvi = 22.84.12
-Requires:       tex(dvips) tex(tex)
+Requires:       tetex-dvips
 Requires:       xdg-utils ghostscript
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
@@ -30,7 +30,7 @@ BuildRequires:  Xaw3d-devel
 BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:  autoconf213
 BuildRequires:  libtool
-BuildRequires:  kpathsea-devel
+BuildRequires:  tetex
 %if %{with japanese}
 BuildRequires:  freetype-devel >= 2.1.10
 %endif
@@ -269,6 +269,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Mar 14 2008  Jonathan G. Underwood <jonathan.underwood@gmail.com> - 22.84.13-17.1
+- Branched for F8 from devel (i.e. branched from rawhide leading to F-9)
+- Adjust Requires and BuildRequires for F-8 i.e. tetex instead of texlive
+
 * Sun Feb  3  2008 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 22.84.13-17
 - Fix spec file typo