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 1eabaf3..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xpp3
-# $Id$
-NAME := xpp3
-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/xpp3.spec b/xpp3.spec
index 8bbee74..b3ab364 100644
--- a/xpp3.spec
+++ b/xpp3.spec
@@ -33,9 +33,9 @@
 Summary:        XML Pull Parser
 Name:           xpp3
 Version:        1.1.3.8
-Release:        3.2%{?dist}
+Release:        3.3%{?dist}
 Epoch:          0
-License:        ASL 1.1 
+License:        ASL 1.1
 URL:            http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
 Group:          Text Processing/Markup/XML
 Source0:        http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{oversion}_src.tgz
@@ -55,9 +55,9 @@ BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Xml Pull Parser 3rd Edition (XPP3) MXP1 is a new XmlPull 
-parsing engine that is based on ideas from XPP and in 
-particular XPP2 but completely revised and rewritten to 
+Xml Pull Parser 3rd Edition (XPP3) MXP1 is a new XmlPull
+parsing engine that is based on ideas from XPP and in
+particular XPP2 but completely revised and rewritten to
 take best advantage of latest JIT JVMs such as Hotspot in JDK 1.4.
 
 %package minimal
@@ -74,6 +74,7 @@ Minimal XML pull parser implementation.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -131,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/*
 
 %changelog
+* Wed Mar 10 2010 Peter Lemenkov <lemenkov@gmail.com> - 0:1.1.3.8-3.3
+- *-javadoc must also require jpackage-utils (for %%{_javadocdir})
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1.3.8-3.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild