diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 546ec6f..4743efd 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Nicola Squartini <tensor5@gmail.com>
 
 pkgname=atom
-pkgver=1.58.0
-_commit=550c1dae66f97bd3fc31c59e6d8ba5f1299ccaf7
+pkgver=1.60.0
+_commit=03c9ad93793b5e78ea7fbcdcdabf38fd4065fcc0
 pkgrel=1
 pkgdesc='A hackable text editor for the 21st Century'
 arch=('x86_64')
 url='https://github.com/atom/atom'
 license=('MIT' 'custom')
-depends=('apm' 'electron9' 'libxkbfile' 'ripgrep')
+depends=('nodejs-lts-gallium' 'apm' 'electron11' 'libxkbfile' 'ripgrep')
 makedepends=('git' 'npm')
 optdepends=('ctags: symbol indexing support'
             'git: Git and GitHub integration')
@@ -27,9 +27,9 @@ source=("git+https://github.com/atom/atom.git#commit=${_commit}"
         'use-system-apm.patch'
         'use-system-electron.patch')
 sha256sums=('SKIP'
-            'a4f198ae1040637ce72c163585662d94e0d59b593f69d919d0acd7044c316cac'
+            '6a588ef412151f294bd81a1cc7566641a7303084a52e5a53f1f879b603c06a6d'
             '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153'
-            'b3d3706519556a59ba557b695017c9debe8b23efe2782cdb440131520bc0540d'
+            'aef9f6c141d68ef42f53b662b455dcb35100540f986f7ca53f14f7e75f5025fa'
             '954a82abeb0d144891449e3db2126ee3007bea63737146a2239997c932520cbc'
             '5f9946b33024b429b3951629b0e3fd6deeb88895b3467a7e8e0c504b0accd9c5'
             'e321fdfe880cd465918dd1dbb90e4c7d46fc5310f20666eddf0a41cbca4f8ac8'
@@ -37,7 +37,7 @@ sha256sums=('SKIP'
             'a09439c2a908ca174ff3be1f0d85071d12c792ae19748e36fe601e372d6d925b'
             'c93cc88dd704388d4b26a0de0a5938df7ff90cedf8eed0b3b8a675f9cc7d487c'
             '08ae0c93b5ec7eb7d90c65d5d2adbaca538482fba902ed1f8414024db0d21854'
-            'fbd64067aa513f9b51fd33501a8310f976c18049866e636f19542c493246fd19')
+            '3eefb225b2e72bafad832215b9b126a6bdea44699524052a194ff27070de60f5')
 
 prepare() {
   cd ${pkgname}
@@ -53,11 +53,13 @@ prepare() {
 
 build() {
   cd ${pkgname}
+  CXXFLAGS="${CXXFLAGS/ -fexceptions/}"
 
-  ATOM_RESOURCE_PATH="${PWD}" \
-  npm_config_build_from_source=true \
-  npm_config_target=$(< /usr/lib/electron9/version) \
-  apm install
+  ATOM_RESOURCE_PATH="${PWD}" ATOM_HOME="${srcdir}/.atom"\
+    npm_config_build_from_source=true \
+    npm_config_target=$(< /usr/lib/electron11/version) \
+    GYP_DEFINES="openssl_fips=" \
+    apm install
 
   # Use system ctags
   cd node_modules/symbols-view
@@ -78,7 +80,8 @@ build() {
   env \
     npm_config_disturl=https://electronjs.org/headers \
     npm_config_runtime=electron \
-    npm_config_target=$(< /usr/lib/electron9/version) \
+    npm_config_target=$(< /usr/lib/electron11/version) \
+    GYP_DEFINES="openssl_fips=" \
     node-gyp rebuild
   cd ../..
 
@@ -88,8 +91,8 @@ build() {
   # Set ELECTRON_VERSION (see use-system-electron.patch)
   env \
     ELECTRON_RUN_AS_NODE=1 \
-    ELECTRON_VERSION=$(< /usr/lib/electron9/version) \
-    electron9 \
+    ELECTRON_VERSION=$(< /usr/lib/electron11/version) \
+    electron11 \
     build --no-bootstrap
 }
 
diff --git a/trunk/atom.js b/trunk/atom.js
index f281bac..f95fc97 100644
--- a/trunk/atom.js
+++ b/trunk/atom.js
@@ -1,4 +1,4 @@
-#!/usr/bin/electron9
+#!/usr/bin/electron11
 
 const name = "atom";
 
diff --git a/trunk/fix-atom-sh.patch b/trunk/fix-atom-sh.patch
index 98d2949..bd7246a 100644
--- a/trunk/fix-atom-sh.patch
+++ b/trunk/fix-atom-sh.patch
@@ -1,3 +1,5 @@
+diff --git a/atom.sh b/atom.sh
+index ef709ebb3..8a564c1a1 100755
 --- a/atom.sh
 +++ b/atom.sh
 @@ -1,29 +1,5 @@
@@ -30,7 +32,7 @@
  # Only set the ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT env var if it hasn't been set.
  if [ -z "$ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT" ]
  then
-@@ -90,105 +66,24 @@
+@@ -90,110 +66,24 @@ fi
  ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
  mkdir -p "$ATOM_HOME"
  
@@ -47,17 +49,11 @@
 -    ATOM_PATH="$(dirname "$ATOM_APP")"
 -    ATOM_APP_NAME="$(basename "$ATOM_APP")"
 -  fi
-+ATOM_PATH="/usr/lib/atom/atom"
- 
+-
 -  if [ ! -z "${ATOM_APP_NAME}" ]; then
 -    # If ATOM_APP_NAME is known, use it as the executable name
 -    ATOM_EXECUTABLE_NAME="${ATOM_APP_NAME%.*}"
-+if [ $EXPECT_OUTPUT ]; then
-+  "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-+  ATOM_EXIT=$?
-+  if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
-+    exit "${EXIT_CODE_OVERRIDE}"
-   else
+-  else
 -    # Else choose it from the inferred channel name
 -    if [ "$CHANNEL" == 'beta' ]; then
 -      ATOM_EXECUTABLE_NAME="Atom Beta"
@@ -86,9 +82,9 @@
 -        exit 1
 -      fi
 -    fi
-+    exit ${ATOM_EXIT}
-   fi
--
+-  fi
++ATOM_PATH="/usr/lib/atom/atom"
+ 
 -  if [ $EXPECT_OUTPUT ]; then
 -    "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
 -    ATOM_EXIT=$?
@@ -97,9 +93,15 @@
 -    else
 -      exit ${ATOM_EXIT}
 -    fi
--  else
++if [ $EXPECT_OUTPUT ]; then
++  "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
++  ATOM_EXIT=$?
++  if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
++    exit "${EXIT_CODE_OVERRIDE}"
+   else
 -    open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
--  fi
++    exit ${ATOM_EXIT}
+   fi
 -elif [ $OS == 'Linux' ]; then
 -  SCRIPT=$(readlink -f "$0")
 -  USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
@@ -119,6 +121,11 @@
 -      ;;
 -  esac
 -
+-  #Will allow user to get context menu on cinnamon desktop enviroment
+-  if [[ "$(expr substr $(printenv | grep "DESKTOP_SESSION=") 17 8)" == "cinnamon" ]]; then
+-    cp "resources/linux/desktopenviroment/cinnamon/atom.nemo_action" "/usr/share/nemo/actions/atom.nemo_action"
+-  fi
+-
 -  : ${TMPDIR:=/tmp}
 -
 -  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
diff --git a/trunk/use-system-electron.patch b/trunk/use-system-electron.patch
index 5386704..2629bae 100644
--- a/trunk/use-system-electron.patch
+++ b/trunk/use-system-electron.patch
@@ -119,7 +119,7 @@
 -        packagedAppPath,
 -        CONFIG.executableName
 -      );
-+      nodeBundledInElectronPath = 'electron9';
++      nodeBundledInElectronPath = 'electron11';
      }
      childProcess.execFileSync(
        nodeBundledInElectronPath,