diff --git a/check-version.sh b/check-version.sh
new file mode 100644
index 0000000..2ad8174
--- /dev/null
+++ b/check-version.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Gitlab repository
+REPO="xfce/thunar"
+
+# Replace slash with URL encoded representation
+REPO=$(echo "$REPO" | sed 's|/|%2F|g')
+
+# 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)
+
+echo "$TAG_NAME"
diff --git a/pkg.info b/pkg.info
index d87e068..c8babd3 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,10 +1,10 @@
 name: thunar
 description: A modern file manager for the Xfce Desktop Environment
-version: 4.18.10
+version: 4.20.4
 url: https://docs.xfce.org/xfce/thunar/start
 license: GPL2-or-later,LGPL2.1-only
 architecture: any
 depends: ["desktop-file-utils","exo","hicolor-icon-theme","libgudev","libnotify","libpng","libxfce4ui","libxfce4util","pcre2"]
 optional_depends: ["thunar-volman","tumbler"]
-make_depends: ["glib","gobject-introspection","intltool","xfce4-panel"]
+make_depends: ["glib","gobject-introspection","gtk-doc","xfce4-panel","xfce4-dev-tools"]
 type: source
diff --git a/source.sh b/source.sh
index 36a0b3b..428ede3 100644
--- a/source.sh
+++ b/source.sh
@@ -2,7 +2,7 @@
 # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
 # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
 
-DOWNLOAD="https://archive.xfce.org/src/xfce/thunar/${BPM_PKG_VERSION%.*}/thunar-${BPM_PKG_VERSION}.tar.bz2"
+DOWNLOAD="https://gitlab.xfce.org/xfce/thunar/-/archive/thunar-${BPM_PKG_VERSION}/thunar-thunar-${BPM_PKG_VERSION}.tar.gz"
 FILENAME="${DOWNLOAD##*/}"
 
 # The prepare function is executed in the root of the temp directory
@@ -10,12 +10,15 @@ FILENAME="${DOWNLOAD##*/}"
 prepare() {
   wget "$DOWNLOAD"
   tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
+
+  cd "$BPM_SOURCE"
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 # The build function is executed in the source directory
 # This function is used to compile the source code
 build() {
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-debug --enable-maintainer-mode
   make
 }