diff --git a/jdepend.spec b/jdepend.spec
index d6eea50..807cfe9 100644
--- a/jdepend.spec
+++ b/jdepend.spec
@@ -30,7 +30,7 @@
 
 Name:           jdepend
 Version:        2.9.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Summary:        Java Design Quality Metrics
 License:        BSD
@@ -39,9 +39,14 @@ Group:          Development/Libraries
 #Downloaded from http://github.com/clarkware/jdepend/tarball/2.9.1
 Source0:        clarkware-jdepend-5798059.tar.gz
 Source1:        %{name}-%{version}.pom
-BuildRequires:  ant
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
+
+Requires:      java
+Requires:      jpackage-utils
+
+BuildRequires: ant
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
 
 %description
 JDepend traverses a set of Java class and source file directories and
@@ -79,8 +84,7 @@ ant jar javadoc
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
+install -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -93,31 +97,26 @@ cp -pr sample $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 # depmap
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
-
-%post
-%update_maven_depmap
- 
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files
-%defattr(-,root,root)
 %doc README LICENSE docs
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %files demo
-%defattr(-,root,root)
 %{_datadir}/%{name}
 
 %changelog
+* Fri Jun 19 2012 Jaromir Capik <jcapik@redhat.com> 0:2.9.1-6
+- Fixing #832140 - jdepend post error
+- Minor spec file changes according to the latest guidelines
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.9.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild