diff --git a/check-version.sh b/check-version.sh
index 2ad8174..7126676 100644
--- a/check-version.sh
+++ b/check-version.sh
@@ -6,7 +6,10 @@ REPO="xfce/thunar"
 # Replace slash with URL encoded representation
 REPO=$(echo "$REPO" | sed 's|/|%2F|g')
 
+# Get XFCE version
+XFCE_VERSION=$(bpm q -d xfce4 | grep '^Version: ' | cut -d' ' -f2 | cut -d'-' -f1)
+
 # Get tag name using Gitlab Rest API
-TAG_NAME=$(curl -s -L https://gitlab.xfce.org/api/v4/projects/"$REPO"/repository/tags | jq -r '.[].name' | cut -d'-' -f2 | grep -v 'pre' | sort -V | tail -n1)
+TAG_NAME=$(curl -s -L https://gitlab.xfce.org/api/v4/projects/"$REPO"/repository/tags | jq -r '.[].name' | cut -d'-' -f2 | grep "^${XFCE_VERSION}" | head -n1)
 
 echo "$TAG_NAME"
diff --git a/pkg.info b/pkg.info
index 085d5bf..697ab47 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,7 +1,7 @@
 name: thunar
 description: A modern file manager for the Xfce Desktop Environment
-version: 4.20.4
-revision: 4
+version: 4.20.6
+revision: 1
 url: https://docs.xfce.org/xfce/thunar/start
 license: GPL2-or-later,LGPL2.1-only
 architecture: any
@@ -31,4 +31,4 @@ downloads:
   - url: https://gitlab.xfce.org/xfce/thunar/-/archive/thunar-${BPM_PKG_VERSION}/thunar-thunar-${BPM_PKG_VERSION}.tar.gz
     extract_to: ${BPM_SOURCE}
     extract_strip_components: 1
-    checksum: 951a4da7b0861a8363699c31850334e8abd355ea52559c10fc1df512ea543df0
+    checksum: 161f49b6f3698ad051905ffcaaf9979b414dc50581aa3536b98a73296998c2b1