diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index f9e2091..f85d89d 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -436,7 +436,8 @@
 # output dir stub
 %define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
 %define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
-%global altjavaoutputdir install/altjava.install
+%global miscinstalloutputdir install
+%global altjavaoutputdir %{miscinstalloutputdir}/altjava.install
 %define packageoutputdir() %{expand:packages/jdk%{featurever}.packages%{?1}}
 # we can copy the javadoc to not arched dir, or make it not noarch
 %define uniquejavadocdir()    %{expand:%{fullversion}.%{_arch}%{?1}}
@@ -1067,7 +1068,8 @@ EXTRA_CPP_FLAGS="$(echo ${EXTRA_CPP_FLAGS} | sed -e 's|-mstackrealign|-mincoming
 export EXTRA_CFLAGS EXTRA_CPP_FLAGS
 
 echo "Building %{SOURCE11}"
-mkdir -p %{altjavaoutputdir}
+mkdir %{miscinstalloutputdir}
+mkdir %{altjavaoutputdir}
 gcc ${EXTRA_CFLAGS} -o %{altjavaoutputdir}/%{alt_java_name} %{SOURCE11}
 
 echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"
@@ -1322,6 +1324,7 @@ function packagejdk() {
     local srcdir=$(pwd)/%{top_level_dir_name}
     local tapsetdir=$(pwd)/tapset
     local altjavadir=$(pwd)/${3}
+    local gensources=$(pwd)/%{miscinstalloutputdir}/%{generated_sources_name}
 
     echo "Packaging build from ${imagesdir} to ${packagesdir}..."
     mkdir -p ${packagesdir}
@@ -1380,7 +1383,8 @@ function packagejdk() {
 %if %{with_systemtap}
         cp -a ${tapsetdir}* ${miscname}
 %endif
-        cp -avr ${altjavadir}/%{alt_java_name} ${altjavadir}/../%{generated_sources_name} ${miscname}
+        cp -av ${altjavadir}/%{alt_java_name} ${miscname}
+        cp -avr ${gensources} ${miscname}
         tar -cJf ${miscarchive} ${miscname}
         genchecksum ${miscarchive}
     fi