diff --git a/comfy-netbsd.sh b/comfy-netbsd.sh
index f3f3c23738befb3c6fab19661801d2fe3c89d7fb..1a7e205861b882ba3c7d0bc677881e56ef8028a3 100644
--- a/comfy-netbsd.sh
+++ b/comfy-netbsd.sh
@@ -5,8 +5,8 @@
 #
 
 # Get architecture, relase etc to build repository path
-ARCH=`grep MACHINE_ARCH /etc/release | awk '{print $3}' | tr -d "'" 
-VER=`grep DISTRIBVER    /etc/release | awk '{print $3}' | tr -d "'"
+ARCH=`grep MACHINE_ARCH /etc/release | awk '{print $3}' | tr -d "'"`
+VER=`grep DISTRIBVER    /etc/release | awk '{print $3}' | tr -d "'" | sed 's/_.*//'`
 
 # Package list to be installed, as you see fit
 PKGLIST="wget nano free vim tmux bash curl sudo psmisc mtr htop mozilla-rootcerts* git alpine elinks"
@@ -21,7 +21,6 @@ TEMP=$TEMP_DIR/comfy.tmp.$$
 
 echo "Initial setup, installing pkgin..."
 ftp -p ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/$ARCH/$VER/All/pkgin-*.tgz || exit 1
-ftp -p ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/$ARCH/$VER/All/pkg_install-20*.tgz || exit 1
 pkg_add `ls pkgin-*.tgz`
 
 # Setup pkgin repository for this system