diff --git a/scripts/gvm-default b/scripts/gvm-default
index 9c4694e..06d15b5 100644
--- a/scripts/gvm-default
+++ b/scripts/gvm-default
@@ -4,6 +4,12 @@ unset GOOS
 unset GOPATH
 unset GOBIN
 
+mkdir -p $GVM_ROOT/logs > /dev/null 2>&1
+mkdir -p $GVM_ROOT/gos > /dev/null 2>&1
+mkdir -p $GVM_ROOT/archive > /dev/null 2>&1
+mkdir -p $GVM_ROOT/archive/package > /dev/null 2>&1
+mkdir -p $GVM_ROOT/environments > /dev/null 2>&1
+
 export GVM_VERSION=`cat $GVM_ROOT/VERSION`
 export PATH=$GVM_ROOT/bin:$PATH
 [ -f $GVM_ROOT/environments/default ] && . $GVM_ROOT/environments/default
diff --git a/scripts/install b/scripts/install
index 4b651cd..08c1950 100755
--- a/scripts/install
+++ b/scripts/install
@@ -69,6 +69,9 @@ install_go() {
 	# Create the target folder
 	mkdir -p $GO_INSTALL_ROOT &>> $GVM_ROOT/logs/go-$version-install.log || 
 		display_error "Couldn't create target folder"
+	# Create the global package set folder
+	mkdir -p $GVM_ROOT/pkgsets/$version &>> $GVM_ROOT/logs/go-$version-install.log || 
+		display_error "Couldn't create global package set folder"
 
 	# Copy the source and checkout the version
 	copy_source