diff --git a/build_orig.sh b/build_orig.sh
index 32def3e..e3cd617 100644
--- a/build_orig.sh
+++ b/build_orig.sh
@@ -42,12 +42,13 @@ do
   mkdir -p $WORK_DIR/${type}
   pushd $WORK_DIR/${type}
   unzip $DIR/../$outputfile
+  unzip versionChangeSet/univ_viva_cli_rel/storcli_All_OS.zip
   popd
   mkdir -p $WORK_DIR/${app}-${version}/${type}
   dos2unix $WORK_DIR/${type}/*.txt
   mv $WORK_DIR/${type}/*.txt $WORK_DIR/${app}-${version}
   pushd $WORK_DIR/${app}-${version}/${type}
-  rpm2cpio $WORK_DIR/${type}/storcli_all_os/Linux/*.rpm | cpio -idmv
+  rpm2cpio $WORK_DIR/${type}/storcli_All_OS/Linux/*.rpm | cpio -idmv
   case "${type}" in
     "amd64" )
       rm -f opt/MegaRAID/storcli/storcli
@@ -76,6 +77,7 @@ popd
 
 VER=`cat $WORK_DIR/version.txt`
 echo "Importing $DIR/../$FILENAME as $VER into git"
+#exit 1
 cleanup
 gbp import-orig --pristine-tar -u $VER $DIR/../$FILENAME
 
diff --git a/files.diz b/files.diz
index b80b9db..14095d9 100644
--- a/files.diz
+++ b/files.diz
@@ -1,2 +1,2 @@
-amd64!storcli!1.19.4.1!1.19.04_StorCLI.zip!http://docs.avagotech.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.19.04_StorCLI.zip!b2d227422d63e7954332aa81f5a5e1a2
-i386!storcli!1.19.4.1!1.19.04_StorCLI.zip!http://docs.avagotech.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.19.04_StorCLI.zip!b2d227422d63e7954332aa81f5a5e1a2
+amd64!storcli!1.21.6.1!1.21.16_StorCLI.zip!https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.21.16_StorCLI.zip!c2689d7b1975c28474df13e07d0909a2
+i386!storcli!1.21.6.1!1.21.16_StorCLI.zip!https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/1.21.16_StorCLI.zip!c2689d7b1975c28474df13e07d0909a2