diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec
index 147ad92..dabe3b4 100644
--- a/apache-commons-lang3.spec
+++ b/apache-commons-lang3.spec
@@ -18,7 +18,7 @@
 
 %define base_name lang3
 %define short_name commons-%{base_name}
-Name:           apache-commons-lang3
+Name:           apache-%{short_name}
 Version:        3.8.1
 Release:        0
 Summary:        Apache Commons Lang Package
@@ -73,27 +73,36 @@ ant \
      jar javadoc
 
 %install
+
 # jars
-mkdir -p %{buildroot}%{_javadir}
-cp -p target/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
-(cd %{buildroot}%{_javadir} && for jar in apache-*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
+install -dm 755 %{buildroot}%{_javadir}
+install -m 0644  target/%{short_name}.jar %{buildroot}%{_javadir}/%{short_name}-%{version}.jar
+pushd %{buildroot}%{_javadir}
+  ln -s %{short_name}-%{version}.jar %{short_name}.jar
+  ln -s %{short_name}-%{version}.jar %{name}-%{version}.jar
+  ln -s %{name}-%{version}.jar %{name}.jar
+popd
 
 # pom
-mkdir -p %{buildroot}%{_mavenpomdir}
-cp -p pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+install -dm 755 %{buildroot}%{_mavenpomdir}
+install -m 0644  pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}-%{version}.pom
+%add_maven_depmap %{short_name}-%{version}.pom %{short_name}-%{version}.jar
+
 # javadoc
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}/
 
 %files
 %license LICENSE.txt
 %doc NOTICE.txt RELEASE-NOTES.txt
-%{_javadir}/%{name}.jar
-%{_javadir}/%{short_name}.jar
+%{_javadir}/*.jar
 %{_mavenpomdir}/*
-%{_datadir}/maven-metadata/%{name}.xml
+%if %{defined _maven_repository}
+%{_mavendepmapfragdir}/%{name}
+%else
+%{_datadir}/maven-metadata/%{name}.xml*
+%endif
 
 %files javadoc
 %{_javadocdir}/%{name}