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 e2c9de1..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: vecmath1.2
-# $Id$
-NAME := vecmath1.2
-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/vecmath1.2.spec b/vecmath1.2.spec
index 4542a8c..79d5b76 100644
--- a/vecmath1.2.spec
+++ b/vecmath1.2.spec
@@ -1,13 +1,22 @@
 Name:           vecmath1.2
 Version:        1.14
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Free version of vecmath from the Java3D 1.2 specification
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://www.objectclub.jp/download/vecmath_e
 Source0:        http://www.objectclub.jp/download/files/vecmath//%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  java-javadoc java-gcj-compat-devel
+BuildArch:      noarch
+
+BuildRequires:  java-devel >= 1:1.6.0
+BuildRequires:  jpackage-utils
+
+Requires:       jpackage-utils
+Requires:       java >= 1:1.6.0
+
+# Necessary due to architecture change to noarch
+Obsoletes:      %{name} < %{version}-%{release}
 
 %description
 This is an unofficial implementation (java source code) of the javax.vecmath
@@ -21,74 +30,57 @@ Generic matrices' LU and SV decomposition are also there.
 %package javadoc
 Group:          Development/Libraries
 Summary:        Javadoc for %{name}
+Requires:       %{name} = %{version}-%{release}
+# Necessary due to architecture change to noarch
+Obsoletes:      %{name}-javadoc < %{version}-%{release}
 
 %description javadoc
-Javadoc for %{name}.
+This package contains the API documentation for %{name}.
 
 
 %prep
 %setup -q
+find -name *.jar -delete
+find -name *.class -delete
 
 
 %build
 make -f Makefile.unix all docs
 pushd classes
-jar cf ../%{name}-%{version}.jar .
+jar cf ../%{name}.jar .
 popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# dirs
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-
 # jar
-install -m 644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/vecmath.jar
+install -D -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
-cp -r docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# gcj
-%{_bindir}/aot-compile-rpm
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+cp -r docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-
 %files
 %defattr(-,root,root,-)
 %doc README CHANGES
-%{_javadir}/vecmath*
-%{_libdir}/gcj/%{name}
+%{_javadir}/%{name}.jar
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}/
 
 
 %changelog
+* Mon Sep 28 2009 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.14-5
+- Modernized spec file to conform to Java guidelines.
+- Removed clash with vecmath package.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.14-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild