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 59e123d..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xmlunit
-# $Id$
-NAME := xmlunit
-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/xmlunit.spec b/xmlunit.spec
index 7993c1d..40242c3 100644
--- a/xmlunit.spec
+++ b/xmlunit.spec
@@ -32,7 +32,7 @@
 
 Name:           xmlunit
 Version:        1.0
-Release:        8.2%{?dist}
+Release:        8.3%{?dist}
 Epoch:          0
 Summary:        Provides classes to do asserts on xml
 License:        BSD
@@ -53,6 +53,7 @@ Requires:       junit >= 0:3.8
 Requires:       xalan-j2
 Requires:       xml-commons-apis
 Requires:       jaxp_parser_impl
+Requires:       jpackage-utils
 Group:          Development/Testing
 %if ! %{gcj_support}
 BuildArch:      noarch
@@ -73,6 +74,7 @@ expressions.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires:       jpackage-utils
 
 %description    javadoc
 Javadoc for %{name}
@@ -150,7 +152,7 @@ fi
 %{_javadir}/*
 %doc README.txt LICENSE.txt XMLUnit.pdf example.html
 %{_datadir}/maven2/poms/*
-%{_mavendepmapfragdir}
+%{_mavendepmapfragdir}/*
 %if %{gcj_support}
 %dir %attr(-,root,root) %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
@@ -163,6 +165,9 @@ fi
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Mar 11 2010 Peter Lemenkov <lemenkov@gmail.com> - 0:1.0-8.3
+- Added missing Requires jpackage-utils
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-8.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild