diff --git a/scripts/clean b/scripts/clean
new file mode 100755
index 0000000000..0ff1830775
--- /dev/null
+++ b/scripts/clean
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd $(dirname $0)/..
+
+rm -rf dist bin build k3s hyperkube kubectl
diff --git a/scripts/package b/scripts/package
index 9e57953ae6..2e953e40f6 100755
--- a/scripts/package
+++ b/scripts/package
@@ -3,7 +3,7 @@ set -e
 
 cd $(dirname $0)
 
-if [ ! -e ../bin/k3s-server ]; then
+if [ ! -e ../bin/containerd ]; then
     ./build
 fi
 
diff --git a/scripts/package-cli b/scripts/package-cli
index 28b5098754..01559b54c2 100755
--- a/scripts/package-cli
+++ b/scripts/package-cli
@@ -21,6 +21,7 @@ done
 
 rm -rf build/data
 mkdir -p build/data
+mkdir -p dist
 
 tar cvzf ./build/data.tar.gz --exclude ./bin/hyperkube ./bin
 HASH=$(sha256sum ./build/data.tar.gz | awk '{print $1}')
diff --git a/scripts/symlink-k8s.sh b/scripts/symlink-k8s.sh
index 2e65e8435b..f3160c5df5 100755
--- a/scripts/symlink-k8s.sh
+++ b/scripts/symlink-k8s.sh
@@ -13,4 +13,4 @@ done
 rm -rf kubernetes
 mkdir -p kubernetes
 cd kubernetes
-ln -s $1/{cmd,pkg,plugin,third_party} .
+ln -s $1/{cmd,pkg,plugin,third_party,openapi.json,openapi.pb} .