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 6b22444..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wise2
-# $Id$
-NAME := wise2
-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/wise2.spec b/wise2.spec
index 812d6f0..b4482cc 100644
--- a/wise2.spec
+++ b/wise2.spec
@@ -1,10 +1,13 @@
 Name:           wise2
 Version:        2.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tools for comparison of biopolymers
 
 Group:          Applications/Engineering
-License:        GPL
+## Everything is licensed under a BSD-style license except for
+## the HMMer2 libraries and models directory which are GPLv2+
+## see LICENSE files for details. 
+License:        BSD and GPLv2+
 URL:            http://www.ebi.ac.uk/Wise2/
 Source0:        ftp://ftp.ebi.ac.uk/pub/software/unix/wise2/wise%{version}.tar.gz
 Patch0:         wise2-build.patch
@@ -72,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/profile.d/*
 
 %changelog
+* Thu Aug 16 2007 Alex Lancaster <alexl@users.sourceforge.net> 2.2.0-3
+- Clarify license as BSD and GPLv2+
+
 * Mon Apr 12 2007 Alex Lancaster <alexl@users.sourceforge.net> 2.2.0-2
 - Pass $RPM_OPT_FLAGS to compiler as per suggestion from Ralf Corsepius.