diff --git a/openup b/openup
index 9993719..ae6ec13 100755
--- a/openup
+++ b/openup
@@ -26,7 +26,7 @@
 # URL to the latest openup version
 OPENUP_URL="https://stable.mtier.org/openup"
 # signify(1) public key
-PKG_PUBKEY_URL="https://stable.mtier.org/mtier-${_REL_INT}-pkg.pub"
+PKG_PUBKEY_URL="https://stable.mtier.org/mtier-$(uname -r | tr -d '.')-pkg.pub"
 # PKG_PATH for currently running OpenBSD release
 PKG_PATH_MAIN="http://ftp.fr.openbsd.org/pub/OpenBSD/$(uname -r)/packages/$(arch -s)"
 # PKG_PATH for the corresponding release stable service
@@ -34,7 +34,7 @@ PKG_PATH_UPDATE="https://stable.mtier.org/updates/$(uname -r)/$(arch -s)"
 # PKG_PATH addition for the corresponding LTS release stable service
 #PKG_PATH_UPDATE_LTS="https://user%domain.tld:password@stable.mtier.org/updates-lts/$(uname -r)/$(arch -s)"
 # URL to the latest vuxml (vulnerabilities database)
-VUXML_URL="https://stable.mtier.org/vuxml/${_REL_INT}.xml"
+VUXML_URL="https://stable.mtier.org/vuxml/$(uname -r | tr -d '.').xml"
 # exclusion list: pkg names without version/flavor, separated by space
 EXCLUDE_PKG=""
 ########################################################################
@@ -71,10 +71,8 @@ pr() {
 get_key() {
 	[ -r /etc/signify/mtier-${_REL_INT}-pkg.pub ] && return
 
-	pr "Downloading public key"
+	pr "Downloading and installing public key"
 	ftp -Vo ${_TMPKEY} ${PKG_PUBKEY_URL} || bye_bye
-
-	pr "Installing public key"
 	install -m0644 ${_TMPKEY} /etc/signify/mtier-${_REL_INT}-pkg.pub || bye_bye
 }