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 42234c8..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: yadex
-# $Id$
-NAME := yadex
-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 $$d/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/yadex-1.7.0-obj-overflow.patch b/yadex-1.7.0-obj-overflow.patch
new file mode 100644
index 0000000..46de050
--- /dev/null
+++ b/yadex-1.7.0-obj-overflow.patch
@@ -0,0 +1,22 @@
+--- src/objects.cc~	2003-03-28 06:37:32.000000000 -0600
++++ src/objects.cc	2010-05-06 11:42:36.824661556 -0500
+@@ -543,7 +543,7 @@
+ 	 SideDefs[last].yoff = 0;
+ 	 strcpy (SideDefs[last].tex1, "-");
+ 	 strcpy (SideDefs[last].tex2, "-");
+-	 strcpy (SideDefs[last].tex3, default_middle_texture);
++	 strncpy (SideDefs[last].tex3, default_middle_texture, sizeof(SideDefs[last].tex3));
+ 	 SideDefs[last].sector = NumSectors - 1;
+ 	 }
+       MadeMapChanges = 1;
+--- src/editobj.cc~	2003-04-24 15:32:39.000000000 -0500
++++ src/editobj.cc	2010-05-07 16:36:49.825412601 -0500
+@@ -937,7 +937,7 @@
+ 	       struct SideDef *s = SideDefs + l->sidedef1;
+ 	       strcpy (s->tex1, "-");
+ 	       strcpy (s->tex2, "-");
+-	       strcpy (s->tex3, default_middle_texture);
++	       strncpy (s->tex3, default_middle_texture, sizeof(s->tex3));
+ 	       }
+ 	    /* Don't delete the 2nd sidedef, it could be used
+                by another linedef. And if it isn't, the next
diff --git a/yadex.spec b/yadex.spec
index 4a70d54..0c1fc09 100644
--- a/yadex.spec
+++ b/yadex.spec
@@ -1,6 +1,6 @@
 Name:           yadex
 Version:        1.7.0
-Release:        13%{?dist}
+Release:        17%{?dist}
 Summary:        Doom level editor
 
 Group:          Amusements/Graphics
@@ -16,12 +16,13 @@ Patch3:         yadex-1.7.0-destdir.patch
 Patch4:         yadex-1.7.0-datadir.patch
 Patch5:         yadex-1.7.0-gcc41.patch
 Patch6:         yadex-1.7.0.bareelif.patch
+Patch7:         yadex-1.7.0-obj-overflow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  libX11-devel
 # Yadex needs an iwad to run.  freedoom provides a free iwad that we can use.
-Requires:       freedoom
+Requires:       freedoom xorg-x11-fonts-ISO8859-1-75dpi
 
 %description
 Yadex is a Doom level (wad) editor for Unix systems running X, including Linux.
@@ -45,6 +46,7 @@ tedious tasks easy.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p0
 
 
 %build
@@ -101,6 +103,18 @@ fi
 
 
 %changelog
+* Wed Sep 29 2010 Jon Ciesla <limb@jcomserv.net> - 1.7.0-17
+- Requires xorg-x11-fonts-ISO8859-1-75dpi, BZ 620251.
+
+* Fri May 07 2010 Jon Ciesla <limb@jcomserv.net> - 1.7.0-16
+- Addition to object overflow patch.
+
+* Thu May 06 2010 Jon Ciesla <limb@jcomserv.net> - 1.7.0-15
+- Re-patch for buffer overflow crash.
+
+* Thu May 06 2010 Jon Ciesla <limb@jcomserv.net> - 1.7.0-14
+- Patch for buffer overflow crash.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild