diff --git a/jboss-common-core.spec b/jboss-common-core.spec
index b269b53..e7db91b 100644
--- a/jboss-common-core.spec
+++ b/jboss-common-core.spec
@@ -3,7 +3,7 @@
 
 Name:             jboss-common-core
 Version:          2.2.18
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          JBoss Common Classes
 Group:            Development/Libraries
 License:          LGPLv2+ and ASL 1.1
@@ -61,15 +61,15 @@ mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
 
 %install
 # JAR
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/jboss
-install -pm 644 target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/jboss/%{name}.jar
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -pm 644 target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # POM
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.jboss-%{name}.pom
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
 # DEPMAP
-%add_maven_depmap JPP.jboss-%{name}.pom jboss/%{name}.jar
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 # APIDOCS
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -84,6 +84,9 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Mar 09 2012 Marek Goldmann <mgoldman@redhat.com> 2.2.18-5
+- Relocated jars to _javadir
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.18-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild