diff --git a/hamcrest.spec b/hamcrest.spec
index 60a39c9..fec3419 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -39,50 +39,45 @@ Javadoc for %{name}.
 %setup -q -n JavaHamcrest-%{upstream_version}
 %patch0 -p1
 
-rm -rf docs
-rm -rf *gradle*
-rm -rf */*.gradle
-
-mv hamcrest/src .
-rm -rf hamcrest
-rm -rf hamcrest-core
-rm -rf hamcrest-integration
-rm -rf hamcrest-library
+sed -i 's/\r//' LICENSE.txt
 
+pushd hamcrest
 cp -p %{SOURCE1} pom.xml
 %pom_add_dep junit:junit::test
 %pom_xpath_inject pom:project '
 <build>
-	<plugins>
-		<plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<version>3.8.1</version>
-		<configuration>
-			<source>1.8</source>
-			<target>1.8</target>
-		</configuration>
-		</plugin>
-	</plugins>
+  <plugins>
+    <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-compiler-plugin</artifactId>
+      <version>any</version>
+      <configuration>
+        <source>1.8</source>
+        <target>1.8</target>
+      </configuration>
+    </plugin>
+  </plugins>
 </build>'
 
 %mvn_alias org.hamcrest:hamcrest org.hamcrest:hamcrest-all
 %mvn_alias org.hamcrest:hamcrest org.hamcrest:hamcrest-core
 %mvn_alias org.hamcrest:hamcrest org.hamcrest:hamcrest-library
 
-sed -i 's/\r//' LICENSE.txt
-
 %build
+pushd hamcrest
 %mvn_build
+popd
 
 %install
+pushd hamcrest
 %mvn_install
+popd
 
-%files -f .mfiles
+%files -f hamcrest/.mfiles
 %doc README.md
 %license LICENSE.txt
 
-%files javadoc -f .mfiles-javadoc
+%files javadoc -f hamcrest/.mfiles-javadoc
 %license LICENSE.txt
 
 %changelog