diff --git a/Makefile b/Makefile
index 7499414b0b274e83fd71e77646c995c3921a2b11..e70c8bf14f8a6d76ac2c171d6b4f769279b53ab2 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 -include config.mk
 
 PACKAGE := apk-tools
-VERSION := 2.0.7
+VERSION := 2.1.0_pre1
 
 ##
 # Default directories
diff --git a/src/fetch.c b/src/fetch.c
index 0f39ecd2c70df2b194d52acd80799f43ed2826fe..09e3b9d3ecffd49cc44b472c30f093bf7680d751 100644
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -109,12 +109,11 @@ static int fetch_package(struct fetch_ctx *fctx,
 			return 0;
 	}
 
-	apk_message("Downloading %s-" BLOB_FMT, pkg->name->name,
-		    BLOB_PRINTF(*pkg->version));
+	apk_message("Downloading " PKG_VER_FMT, PKG_VER_PRINTF(pkg));
 	repo = apk_db_select_repo(db, pkg);
 	if (repo == NULL) {
-		apk_error("%s-" BLOB_FMT ": package is not currently available",
-			  pkg->name->name, BLOB_PRINTF(*pkg->version));
+		apk_error(PKG_VER_FMT ": package is not currently available",
+			  PKG_VER_PRINTF(pkg));
 		return -1;
 	}