diff --git a/appveyor.yml b/appveyor.yml
index 0339032255..2fd08e81ed 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,12 +16,19 @@ cache:
 
 install:
 - ps: | # set env vars for versioning
-    $commDate = $env:APPVEYOR_REPO_COMMIT_TIMESTAMP.Substring(0,10)
-    $commHash = $env:APPVEYOR_REPO_COMMIT.Substring(0,8)
     $commTag = $(git describe --tags $(git rev-list --tags --max-count=1))
+    $commCount = $(git rev-list --count HEAD)
+    $commHash = $env:APPVEYOR_REPO_COMMIT.Substring(0,8)
+    
+    if ($env:APPVEYOR_PULL_REQUEST_NUMBER) {
+        $env:BUILD = "{0}-{1}" -f $commTag, $commHash
+    }
+    else {
+        $env:BUILD = "{0}-{1}-{2}" -f $commTag, $commCount, $commHash
+    }
     
     $env:AVVER = "{0}-{1}" -f $commTag.TrimStart("v"), $env:APPVEYOR_BUILD_NUMBER
-    $env:RPCS3 = "rpcs3-{0}-{1}-{2}_win64.7z" -f $commTag, $commDate, $commHash
+    $env:RPCS3 = "rpcs3-{0}_win64.7z" -f $env:BUILD
 
 - ps: | # used for experimental build warnings for pr builds
     $env:BRANCH = "{0}/{1}/#{2}" -f $env:APPVEYOR_REPO_NAME, `
@@ -80,7 +87,7 @@ after_build:
       C:\OpenSSL-Win64\bin\ssleay32.dll
 
 - ps: | # generate sha256 hashes
-    (get-filehash $env:RPCS3 -algorithm SHA256).Hash > "$env:RPCS3.sha256"
+    (get-filehash $env:RPCS3 -algorithm SHA256).Hash > ("{0}.sha256" -f $env:RPCS3)
     (get-filehash openssl_win64.7z -algorithm SHA256).Hash > "openssl_win64.7z.sha256"
 
 test: off