diff --git a/joda-time.spec b/joda-time.spec
index 6f463b6..fda125b 100644
--- a/joda-time.spec
+++ b/joda-time.spec
@@ -2,7 +2,7 @@
 
 Name:             joda-time
 Version:          1.6.2
-Release:          5.%{tzversion}%{?dist}
+Release:          6.%{tzversion}%{?dist}
 Summary:          Java date and time API
 
 Group:            Development/Libraries
@@ -12,7 +12,6 @@ Source0:          http://downloads.sourceforge.net/%{name}/%{name}-%{version}-sr
 Source1:          ftp://elsie.nci.nih.gov/pub/%{tzversion}.tar.gz
 # Remove maven toolchanins from pom.xml (not present in fedora yet)
 Patch0:           joda-time-remove-toolchains-from-pom.patch
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
@@ -22,10 +21,6 @@ BuildRequires:    maven
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
 
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
-
-
 %description
 Joda-Time provides a quality replacement for the Java date and time classes. The
 design allows for multiple calendar systems, while still providing a simple API.
@@ -69,48 +64,33 @@ mvn-rpmbuild \
 
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%clean
-rm -rf %{buildroot}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt RELEASE-NOTES.txt ToDo.txt
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
-
-
 %changelog
+* Tue Nov 29 2011 Alexander Kurtakov <akurtako@redhat.com> 1.6.2-6.tzdata2011f
+- Adapt to current guidelines.
+
 * Fri Apr 15 2011 Chris Spike <spike@fedoraproject.org> 1.6.2-5.tzdata2011f
 - New tzdata (2011f)
 - Fixed build for maven 3