diff --git a/9_repackjre.sh b/9_repackjre.sh
index 031a461..709b8cf 100755
--- a/9_repackjre.sh
+++ b/9_repackjre.sh
@@ -17,6 +17,13 @@ mkdir -p $work
 mkdir -p $work1
 mkdir -p "$out"
 
+copyjvmlib() {
+  if [[ -d lib/$1 ]]; then
+    echo "Moving $1 VM for $2"
+    mv lib/$1 "$work1"/lib/;
+  fi
+}
+
 # here comes a not-so-complicated functions to easily make desired arch
 ## Usage: makearch [jre_libs_dir_name] [name_in_tarball]
 makearch () {
@@ -30,7 +37,9 @@ makearch () {
   mv lib/jexec "$work1"/lib/;
   
   # server contains the libjvm.so
-  mv lib/$JVM_VARIANTS "$work1"/lib/;
+  copyjvmlib server $2
+  copyjvmlib client $2
+  
   
   # All the other .so files are at the root of the lib folder
   find ./ -name '*.so' -execdir mv {} "$work1"/lib/{} \;