diff --git a/.gitignore b/.gitignore
index 396efa6..b69c229 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /atinject-1.tar.xz
+/LICENSE-2.0.txt
diff --git a/atinject.spec b/atinject.spec
index 215cd05..5a3c200 100644
--- a/atinject.spec
+++ b/atinject.spec
@@ -1,35 +1,23 @@
-%global artifactId javax.inject
-
 Name:           atinject
 Version:        1
-Release:        10.20100611svn86%{?dist}
+Release:        11.20100611svn86%{?dist}
 Summary:        Dependency injection specification for Java (JSR-330)
-
-Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://code.google.com/p/atinject/
+BuildArch:      noarch
 # latest release doesn't generate javadocs and there is no source
 # tarball with pom.xml or ant build file
 #
 # svn export -r86 http://atinject.googlecode.com/svn/trunk atinject-1
+# rm -rf atinject-1/{lib,javadoc}/
 # tar caf atinject-1.tar.xz atinject-1
 Source0:        %{name}-%{version}.tar.xz
 Source1:        MANIFEST.MF
-BuildArch:      noarch
+Source2:        http://www.apache.org/licenses/LICENSE-2.0.txt
 
-BuildRequires:       maven-local
-BuildRequires:       maven-install-plugin
-BuildRequires:       maven-jar-plugin
-BuildRequires:       maven-surefire-provider-junit4
-BuildRequires:       maven-surefire-plugin
-BuildRequires:       maven-javadoc-plugin
-BuildRequires:       maven-resources-plugin
-BuildRequires:       maven-release-plugin
-BuildRequires:       maven-compiler-plugin
-BuildRequires:       zip
-
-
-Requires:       jpackage-utils
+BuildRequires:  java-devel
+BuildRequires:  junit
+Requires:       java
 
 %description
 This package specifies a means for obtaining objects in such a way as
@@ -40,16 +28,12 @@ beneficial to most nontrivial applications.
 
 %package        javadoc
 Summary:        API documentation for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description    javadoc
 %{summary}.
 
 %package        tck
 Summary:        TCK for testing %{name} compatibility with JSR-330
-Group:          Development/Libraries
-Requires:       jpackage-utils
 Requires:       %{name} = %{version}-%{release}
 Requires:       junit
 
@@ -59,64 +43,54 @@ Requires:       junit
 
 %prep
 %setup -q
-
-rm -rf lib/* javadoc/
-
-ln -sf `build-classpath junit` lib/junit.jar
+cp %{SOURCE2} LICENSE
+ln -s %{_javadir} lib
 
 %build
-./build.sh
-pushd build
-for i in *.zip; do
-    unzip $i
-done
+set -e
+alias rm=:
+alias xargs=:
+. ./build.sh
 
-#Add OSGi manifest for Eclipse
-mkdir -p META-INF/
-cp %{SOURCE1} META-INF/MANIFEST.MF
-zip -u javax.inject.jar META-INF/MANIFEST.MF
-
-popd
+# Inject OSGi manifest required by Eclipse.
+jar umf %{SOURCE1} build/dist/*.jar
 
 %install
-install -d -m 755 %{buildroot}%{_javadir}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-
-# poms
+# Maven POMs
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-install -pm 644 tck-pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-tck.pom
+install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -p -m 644 tck-pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-tck.pom
 
-# jar files
-install -pm 644 build/%{artifactId}.jar %{buildroot}%{_javadir}/%{name}.jar
-install -pm 644 build/%{artifactId}-tck.jar %{buildroot}%{_javadir}/%{name}-tck.jar
+# JARs
+install -d -m 755 %{buildroot}%{_javadir}
+install -p -m 644 build/dist/*.jar %{buildroot}%{_javadir}/%{name}.jar
+install -p -m 644 build/tck/dist/*.jar %{buildroot}%{_javadir}/%{name}-tck.jar
 
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+# XMvn metadata
+%add_maven_depmap
 %add_maven_depmap JPP-%{name}-tck.pom %{name}-tck.jar -f tck
 
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+# Javadocs
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}/tck
 cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
-
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-tck
-cp -pr build/tck/javadoc/* %{buildroot}%{_javadocdir}/%{name}-tck
+cp -pr build/tck/javadoc/* %{buildroot}%{_javadocdir}/%{name}/tck
 
 
-%files
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}.jar
+%files -f .mfiles
+%doc LICENSE
 
-%files tck
-%{_mavendepmapfragdir}/%{name}-tck
-%{_javadir}/%{name}-tck.jar
-%{_mavenpomdir}/JPP-%{name}-tck.pom
+%files tck -f .mfiles-tck
 
 %files javadoc
+%doc LICENSE
 %doc %{_javadocdir}/%{name}
-%doc %{_javadocdir}/%{name}-tck
 
 %changelog
+* Fri Jun 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1-11.20100611svn86
+- Remove unneeded BRs
+- Install missing LICENSE file
+- Update to current packaging guidelines
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1-10.20100611svn86
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 2981daa..a62285a 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-42682fced66d3724390a29416d4b149f  atinject-1.tar.xz
+5ed77767af2fa4ba8ef66c3e966bd2b2  atinject-1.tar.xz
+3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt