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 872abda..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: agg
-# $Id: Makefile,v 1.1 2005/11/24 11:57:42 caolanm Exp $
-NAME := agg
-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/agg-generate-tarball.sh b/agg-generate-tarball.sh
index 9b13619..c6f2ebd 100644
--- a/agg-generate-tarball.sh
+++ b/agg-generate-tarball.sh
@@ -13,5 +13,7 @@ tar xzf $file
 for file in copying.txt VERSIONS.TXT gpc.c gpc.h; do
    rm agg-${version}/gpc/$file
 done
+rm agg-${version}/include/agg_conv_gpc.h
+sed -i -e 's/agg_conv_gpc\.h/              /g' agg-${version}/include/Makefile.am
 rm -f $result
 tar czf $result $dir
diff --git a/agg.spec b/agg.spec
index a91fbcb..ba0a144 100644
--- a/agg.spec
+++ b/agg.spec
@@ -1,7 +1,7 @@
 Summary: Anti-Grain Geometry graphical rendering engine
 Name:    agg
 Version: 2.5
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group:   System Environment/Libraries
 URL:     http://www.antigrain.com
 License: GPLv2+
@@ -83,6 +83,11 @@ mv __clean_examples __dist_examples/examples
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jan 29 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 2.5-9
+- also remove include/agg_conv_gpc.h as it also carries a copy of the non-Free
+  GPC license (upstream also recommends removing that file under
+  http://www.antigrain.com/license/index.html#toc0005) (#559611)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 555ff79..a2e7017 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ecb9b5e3ba333157265fb0b308dc857  agg-free-2.5.tar.gz
+6fa25317a3024a186d9a93d1513ca9fa  agg-free-2.5.tar.gz