diff --git a/cdi-api.spec b/cdi-api.spec
index d49f2c9..f6804e7 100644
--- a/cdi-api.spec
+++ b/cdi-api.spec
@@ -26,9 +26,8 @@ APIs for JSR-299: Contexts and Dependency Injection for Java EE
 %{?javadoc_package}
 
 %prep
-%setup -q -n cdi-%{version}
+%setup -q -n cdi-%{version}/api
 
-cd api
 # J2EE API directory
 %mvn_file :{cdi-api} %{name}/@1 javax.enterprise.inject/@1
 
@@ -36,22 +35,15 @@ cd api
 %pom_change_dep "javax.interceptor:javax.interceptor-api" "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec"
 
 %build
-
-(
- cd api
- %mvn_build -- -Denforcer.skip
-)
-
-%global adoc asciidoc
+%mvn_build -- -Denforcer.skip
 
 %install
-cd api
 %mvn_install
 
-%files -n %{?module_prefix}%{name} -f api/.mfiles
-%doc spec/src/main/doc/cdi-spec.%{adoc}
-%license spec/src/main/doc/license-asl2.%{adoc}
-%license spec/src/main/doc/license-jcp.%{adoc}
+%files -n %{?module_prefix}%{name} -f .mfiles
+%doc ../spec/src/main/doc/cdi-spec.asciidoc
+%license ../spec/src/main/doc/license-asl2.asciidoc
+%license ../spec/src/main/doc/license-jcp.asciidoc
 
 %changelog
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-9