diff --git a/src/bin/package/command_list.cpp b/src/bin/package/command_list.cpp
index 63569b16a0..3c0909c751 100644
--- a/src/bin/package/command_list.cpp
+++ b/src/bin/package/command_list.cpp
@@ -265,15 +265,7 @@ private:
 
 	static void _PrintPackageVersion(const BPackageVersionData& version)
 	{
-		printf("%s", version.major);
-		if (version.minor != NULL && version.minor[0] != '\0')
-			printf(".%s", version.minor);
-		if (version.micro != NULL && version.micro[0] != '\0')
-			printf(".%s", version.micro);
-		if (version.preRelease != NULL && version.preRelease[0] != '\0')
-			printf("-%s", version.preRelease);
-		if (version.revision > 0)
-			printf("-%" B_PRIu32, version.revision);
+		printf("%s", BPackageVersion(version).ToString().String());
 	}
 
 private:
diff --git a/src/bin/package_repo/command_list.cpp b/src/bin/package_repo/command_list.cpp
index 38d2842722..9faa532a8b 100644
--- a/src/bin/package_repo/command_list.cpp
+++ b/src/bin/package_repo/command_list.cpp
@@ -231,15 +231,7 @@ struct RepositoryContentListHandler : BRepositoryContentHandler {
 private:
 	static void _PrintPackageVersion(const BPackageVersionData& version)
 	{
-		printf("%s", version.major);
-		if (version.minor != NULL && version.minor[0] != '\0')
-			printf(".%s", version.minor);
-		if (version.micro != NULL && version.micro[0] != '\0')
-			printf(".%s", version.micro);
-		if (version.preRelease != NULL && version.preRelease[0] != '\0')
-			printf("-%s", version.preRelease);
-		if (version.revision > 0)
-			printf("-%" B_PRIu32, version.revision);
+		printf("%s", BPackageVersion(version).ToString().String());
 	}
 
 private: