diff --git a/repo/rstudio-desktop/PKGBUILD b/repo/rstudio-desktop/PKGBUILD
new file mode 100644
index 0000000..8b0389a
--- /dev/null
+++ b/repo/rstudio-desktop/PKGBUILD
@@ -0,0 +1,145 @@
+# Maintainer: Artem Klevtsov <a.a.klevtso@gmail.com>
+# Maintainer: Stephen Martin <hwkiller@gmail.com>
+# Contributor: Conor Anderson <conor@conr.ca>
+
+pkgname=rstudio-desktop
+_vermajor="2023"
+_verminor="03"
+_verpatch="1"
+_versuffix="446"
+_gitcommit="6e31ffc"
+_gitname=rstudio-rstudio-${_gitcommit}
+pkgver=${_vermajor}.${_verminor}.${_verpatch}.${_versuffix}
+_srcname=rstudio-${_vermajor}.${_verminor}.${_verpatch}-${_versuffix}
+_gwtver=2.8.2
+_ginver=2.1.2
+_nodever=16.14.0
+_pandocver="current"
+_quarto="FALSE"
+
+pkgrel=7
+pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language"
+arch=('x86_64')
+url="https://www.rstudio.com/products/rstudio/"
+license=('AGPL3')
+depends=('r>=3.3.0' boost-libs qt5-sensors qt5-svg qt5-webengine qt5-xmlpatterns postgresql-libs sqlite3 soci clang hunspell-en_US mathjax2 pandoc yaml-cpp)
+makedepends=(git 'cmake>=3.1.0' boost desktop-file-utils jdk8-openjdk apache-ant unzip openssl libcups pam patchelf wget yarn)
+optdepends=('git: for git support'
+            'subversion: for subversion support'
+            'openssh-askpass: for a git ssh access'
+            'quarto: for Quarto projects support')
+
+provides=('rstudio-desktop')
+conflicts=('rstudio-desktop' 'rstudio-desktop-bin' 'rstudio-desktop-preview' 'rstudio-desktop-git')
+source=("rstudio-$pkgver.tar.gz::https://github.com/rstudio/rstudio/archive/refs/tags/v${_vermajor}.${_verminor}.${_verpatch}+${_versuffix}.tar.gz"
+        "https://github.com/quarto-dev/quarto/archive/refs/heads/release/rstudio-cherry-blossom.zip"
+        "https://nodejs.org/dist/v${_nodever}/node-v${_nodever}-linux-x64.tar.gz"
+        "qt.conf"
+        "pandoc_version.patch")
+
+sha256sums=('e3a70d784096c8c081cb4f5a9f8cdafe5296c9469d569f0a4546fe7d8285ffd0'
+            'SKIP'
+            '2c69e7b040c208b61ebf9735c63d2e5bcabfed32ef05a9b8dd5823489ea50d6b'
+            '723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921'
+            '286925c442c1818979714feeec1577f03ae8a3527d2478b0f55238e2272a0b9e')
+
+noextract=("gin-${_ginver}.zip")
+
+prepare() {
+    cd ${srcdir}/${_srcname}
+    # Do not use outdated version name of pandoc
+    patch -p1 < ${srcdir}/pandoc_version.patch
+
+    cd "${srcdir}/${_srcname}/dependencies/common"
+    install -d pandoc/${_pandocver}
+ 
+    ln -sfT /usr/share/myspell/dicts dictionaries
+    ln -sfT /usr/share/mathjax2 mathjax-27
+    ln -sfT /usr/bin/pandoc pandoc/${_pandocver}/pandoc
+
+    # Nodejs
+    install -d node/${_nodever}
+    cp -r "${srcdir}/node-v${_nodever}-linux-x64/"* node/${_nodever}
+    #cd "${srcdir}/${_srcname}/src/gwt/panmirror/src/editor"
+    # yarn config set ignore-engines true
+    #yarn install
+
+    # Fix links for src/cpp/session/CMakeLists.txt
+    cd "${srcdir}/${_srcname}/dependencies"
+    ln -sfT /usr/share/myspell/dicts dictionaries
+    ln -sfT /usr/share/mathjax2 mathjax-27
+    #ln -sfT /usr/bin/pandoc pandoc
+
+    # Panmirror is picked up now from Quarto repo
+    # Ideally: git clone --branch release/rstudio-cherry-blossom https://github.com/quarto-dev/quarto.git "${srcdir}/${_srcname}/src/gwt/lib/quarto"
+    mkdir -p "${srcdir}/${_srcname}/src/gwt/lib/quarto"
+    cp -r "${srcdir}/quarto-release-rstudio-cherry-blossom/"* "${srcdir}/${_srcname}/src/gwt/lib/quarto"
+}
+
+build() {
+
+    # Quarto
+    msg "Checking if Quarto is installed..."
+
+    if (pacman -Q quarto >/dev/null) ; then
+        msg "Enabling Quarto support..."
+        _quarto="TRUE"
+        cd "${srcdir}/${_srcname}/dependencies"
+        install -d quarto/bin/tools
+        ln -sfT /usr/bin/quarto quarto/bin/quarto
+        ln -sfT /usr/bin/pandoc quarto/bin/tools/pandoc
+    else
+        msg "Use pandoc, because Quarto is not used..."
+        cd "${srcdir}/${_srcname}/dependencies"
+        install -d pandoc/${_pandocver}/bin/tools
+        ln -sfT /usr/bin/pandoc pandoc/${_pandocver}/bin/tools/pandoc
+    fi
+
+    cd ${srcdir}
+
+    msg "Downloading and installing R packages..."
+    export R_LIBS_USER="${srcdir}/${_srcname}/dependencies/R"
+    _JOBS="$(grep -oP -- "-j\s*\K[0-9]+" <<< "${MAKEFLAGS}")" || _JOBS="1"
+    mkdir -p "${R_LIBS_USER}"
+    for RPKG in rmarkdown renv testthat xml2 yaml; do
+        RINSTALLCMD="if("'!'"require($RPKG, quietly = TRUE)) { options(Ncpus = ${_JOBS} ); install.packages('$RPKG', lib='$R_LIBS_USER', repos='https://cran.rstudio.com/') }"
+        echo "> $RINSTALLCMD"
+        Rscript -e "$RINSTALLCMD"
+    done
+
+    export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:${PATH}
+    export RSTUDIO_VERSION_MAJOR=${_vermajor}
+    export RSTUDIO_VERSION_MINOR=${_verminor}
+    export RSTUDIO_VERSION_PATCH=${_verpatch}
+    export RSTUDIO_VERSION_SUFFIX="+${_versuffix}"
+    export GIT_COMMIT=${_gitcommit}
+    export PACKAGE_OS=$(uname -om)
+    
+    cmake -S "${srcdir}/${_srcname}" -B build \
+          -DRSTUDIO_TARGET=Desktop \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio \
+          -DRSTUDIO_USE_SYSTEM_BOOST=yes \
+          -DRSTUDIO_USE_SYSTEM_YAML_CPP=yes \
+          -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \
+          -DBoost_NO_BOOST_CMAKE=ON \
+          -DQUARTO_ENABLED=${_quarto} \
+          -DRSTUDIO_USE_SYSTEM_SOCI=yes \
+          -DRSTUDIO_BUNDLE_QT=FALSE
+#   make -C build
+}
+
+package() {
+    # Install the program
+    make -C build DESTDIR="${pkgdir}" install
+
+    # Install the license
+    install -Dm 644 "${srcdir}/${_srcname}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+
+    # Symlink main binary
+    install -d "${pkgdir}/usr/bin"
+    ln -s "/usr/lib/rstudio/bin/rstudio" "${pkgdir}/usr/bin/rstudio"
+
+    # BUGFIX: qt5-webengine isn't init'ing properly. Likely an Rstudio bug.
+    install -Dm 644 "${srcdir}/qt.conf" "${pkgdir}/usr/lib/qt/libexec/qt.conf"
+}
diff --git a/repo/rstudio-desktop/pandoc_version.patch b/repo/rstudio-desktop/pandoc_version.patch
new file mode 100644
index 0000000..c3110a0
--- /dev/null
+++ b/repo/rstudio-desktop/pandoc_version.patch
@@ -0,0 +1,11 @@
+--- rstudio-2022.07.0-548/CMakeGlobals.txt	2022-07-07 07:59:49.000000000 +1200
++++ rstudio-2022.07.0-548.patched/CMakeGlobals.txt	2022-07-08 09:24:27.069195093 +1200
+@@ -231,7 +231,7 @@
+ endif()
+ 
+ # pandoc version
+-set(PANDOC_VERSION "2.18" CACHE INTERNAL "Pandoc version")
++set(PANDOC_VERSION "current" CACHE INTERNAL "Pandoc version")
+ 
+ # detect Centos 7, because we don't support Quarto on Centos7
+ set(IS_CENTOS7 FALSE)
diff --git a/repo/rstudio-desktop/qt.conf b/repo/rstudio-desktop/qt.conf
new file mode 100644
index 0000000..840a682
--- /dev/null
+++ b/repo/rstudio-desktop/qt.conf
@@ -0,0 +1,8 @@
+[Paths]
+Headers = /usr/include/qt/
+Data = /usr/share/qt/
+Libraries = /usr/lib/qt/
+LibraryExecutables = /usr/lib/qt/libexec/
+Plugins = /usr/lib/qt/plugins/
+Qml2Imports = /usr/lib/qt/qml/
+Translations = /usr/share/qt/translations/