diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 2862b3a..827c9cd 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc='The Open Source build of Visual Studio Code (vscode) editor'
 #   - dubnium: 10
 # Important: Remember to check https://github.com/microsoft/vscode/blob/master/.yarnrc (choose correct tag) for target electron version
 pkgver=1.39.2
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://github.com/microsoft/vscode'
 license=('MIT')
@@ -78,17 +78,6 @@ prepare() {
           s|@@LICENSE@@|MIT|g
           s|@@URLPROTOCOL@@|vscode|g
           s|inode/directory;||' resources/linux/code{.appdata.xml,.desktop,-url-handler.desktop}
-
-  # Add missing exectable name to bash completion
-  sed -i 's|complete -F _code code|complete -F _code code code-oss|' resources/completions/bash/code
-  # Create new zsh completion file for our binary
-  cp resources/completions/zsh/_code resources/completions/zsh/_code-oss
-  sed -i 's|#compdef code|#compdef code code-oss|' resources/completions/zsh/_code-oss
-
-  # Fix bin path
-  sed -i "s|return path.join(path.dirname(execPath), 'bin', \`\${product.applicationName}\`);|return '/usr/bin/code';|g
-          s|return path.join(appRoot, 'scripts', 'code-cli.sh');|return '/usr/bin/code';|g" \
-          src/vs/platform/environment/node/environmentService.ts
 }
 
 build() {
@@ -137,9 +126,12 @@ package() {
   install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/resources/linux/code.png "$pkgdir"/usr/share/pixmaps/code-oss.png
 
   # Install bash and zsh completions
-  install -Dm 644 $pkgname/resources/completions/bash/code "$pkgdir"/usr/share/bash-completion/completions/code-oss
-  ln -s code-oss "$pkgdir"/usr/share/bash-completion/completions/code
-  install -Dm 644 $pkgname/resources/completions/zsh/_code-oss "$pkgdir"/usr/share/zsh/site-functions/_code-oss
+  sed -i 's|complete -F _code-oss code-oss|complete -F _code-oss code-oss code|' VSCode-linux-$_vscode_arch/resources/completions/bash/code-oss
+  install -Dm 644 VSCode-linux-$_vscode_arch/resources/completions/bash/code-oss "$pkgdir"/usr/share/bash-completion/completions/code-oss
+  sed -i 's|#compdef code-oss|#compdef code-oss code|' VSCode-linux-$_vscode_arch/resources/completions/zsh/_code-oss
+  install -Dm 644 VSCode-linux-$_vscode_arch/resources/completions/zsh/_code-oss "$pkgdir"/usr/share/zsh/site-functions/_code-oss
 
   # Install license files
   install -Dm 644 VSCode-linux-$_vscode_arch/resources/app/LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE