diff --git a/.cvsignore b/.gitignore
similarity index 64%
rename from .cvsignore
rename to .gitignore
index 46713ac..44a0c2e 100644
--- a/.cvsignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 abcm2ps-5.9.5.tar.gz
 abcplus_en-1.1.0.zip
+/abcm2ps-5.9.21.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e8fe554..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: abcm2ps
-# $Id$
-NAME := abcm2ps
-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/abcm2ps.spec b/abcm2ps.spec
index 6d75405..991293c 100644
--- a/abcm2ps.spec
+++ b/abcm2ps.spec
@@ -1,6 +1,6 @@
 Name:           abcm2ps
-Version:        5.9.5
-Release:        2%{?dist}
+Version:        5.9.21
+Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Feb  5 2011 Gérard Milmeister <gemi@bluewin.ch> - 5.9.21-1
+- new release 5.9.21
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.9.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index d0c3de4..01a4335 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-08282cc997a7cd74a95e39a5fa1c57e2  abcm2ps-5.9.5.tar.gz
+68d75b7641adce38e90dbc72d706be16  abcm2ps-5.9.21.tar.gz
 bf8d8ad90ba520f6a9872d2142efbda9  abcplus_en-1.1.0.zip