diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
 name       : mailspring
-version    : 1.7.8
-release    : 33
+version    : 1.8.0
+release    : 34
 source     :
-    - https://github.com/Foundry376/Mailspring/archive/1.7.8.tar.gz : a8d535b1d2cc5a20fcc6d5b727f98c0a9960d6b00d312e86e322cc1ef380e684
+    - https://github.com/Foundry376/Mailspring/releases/download/1.8.0/mailspring-1.8.0-amd64.deb : 06dcd870737ceea1fbb371a206bb037e6bb2f6fdb176109e49286ef3e4fd4f71
 license    :
     - GPL-3.0-or-later
     - Distributable # mailsync
@@ -20,35 +20,15 @@
     - pkgconfig(xkbfile)
     - pkgconfig(xtst)
     - cups-devel
-    - git
-    - nodejs
 rundeps    :
     - gnome-keyring # is required at least until kwallet can handle libsecret.
     - libglvnd
 setup      : |
-    %patch -p1 < $pkgfiles/0001-linux-don-t-build-a-deb-or-rpm-please.patch
-    %patch -p1 < $pkgfiles/0002-do-not-check-git-history.patch
-build      : |
-    npm config set unsafe-perm=true
-    npm install
-    npm run-script build
+    ar x $sources/mailspring-${version}-amd64.deb
+    tar xf data.tar.*
 install    : |
-    # Copy to our destination
-    install -dm00755 $installdir/usr/share/mailspring
-    cp -r $workdir/app/dist/mailspring-linux-x64/* $installdir/usr/share/mailspring/
-
-    # Install binary to $PATH
-    install -dm00755 $installdir/usr/bin/
-    ln -sv /usr/share/mailspring/mailspring $installdir/usr/bin/mailspring
-
-    # Install icons
-    for size in 16 32 64 128 256 512; do
-    install -Dm00644 $workdir/app/build/resources/linux/icons/$size.png \
-      $installdir/usr/share/icons/hicolor/${size}x${size}/apps/mailspring.png
-    done
-
-    # Install desktop file
-    install -Dm00644 $pkgfiles/mailspring.desktop $installdir/usr/share/applications/mailspring.desktop
+    install -dm00644 $installdir
+    cp -r usr $installdir
 
     # Link to System Libraries
     rm $installdir/usr/share/mailspring/libEGL.so
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
     <Source>
         <Name>mailspring</Name>
         <Packager>
-            <Name>Bryan T. Meyers</Name>
-            <Email>bmeyers@datadrake.com</Email>
+            <Name>Alec Scott</Name>
+            <Email>alec@bcs.sh</Email>
         </Packager>
         <License>GPL-3.0-or-later</License>
         <License>Distributable</License>
@@ -21,13 +21,15 @@
         <PartOf>network.mail</PartOf>
         <Files>
             <Path fileType="executable">/usr/bin/mailspring</Path>
+            <Path fileType="data">/usr/share/appdata/mailspring.appdata.xml</Path>
             <Path fileType="data">/usr/share/applications/mailspring.desktop</Path>
+            <Path fileType="doc">/usr/share/doc/mailspring/copyright</Path>
             <Path fileType="data">/usr/share/icons/hicolor/128x128/apps/mailspring.png</Path>
             <Path fileType="data">/usr/share/icons/hicolor/16x16/apps/mailspring.png</Path>
             <Path fileType="data">/usr/share/icons/hicolor/256x256/apps/mailspring.png</Path>
             <Path fileType="data">/usr/share/icons/hicolor/32x32/apps/mailspring.png</Path>
-            <Path fileType="data">/usr/share/icons/hicolor/512x512/apps/mailspring.png</Path>
             <Path fileType="data">/usr/share/icons/hicolor/64x64/apps/mailspring.png</Path>
+            <Path fileType="data">/usr/share/lintian/overrides/mailspring</Path>
             <Path fileType="data">/usr/share/mailspring/LICENSE</Path>
             <Path fileType="data">/usr/share/mailspring/LICENSES.chromium.html</Path>
             <Path fileType="data">/usr/share/mailspring/chrome_100_percent.pak</Path>
@@ -35,7 +37,6 @@
             <Path fileType="data">/usr/share/mailspring/icudtl.dat</Path>
             <Path fileType="data">/usr/share/mailspring/libEGL.so</Path>
             <Path fileType="data">/usr/share/mailspring/libGLESv2.so</Path>
-            <Path fileType="data">/usr/share/mailspring/libVkICD_mock_icd.so</Path>
             <Path fileType="data">/usr/share/mailspring/libffmpeg.so</Path>
             <Path fileType="data">/usr/share/mailspring/locales/am.pak</Path>
             <Path fileType="data">/usr/share/mailspring/locales/ar.pak</Path>
@@ -190,8 +191,8 @@
             <Path fileType="data">/usr/share/mailspring/resources/app.asar.unpacked/node_modules/@paulcbetts/spellchecker/vendor/hunspell/src/parsers/textparser.hxx</Path>
             <Path fileType="data">/usr/share/mailspring/resources/app.asar.unpacked/node_modules/@paulcbetts/spellchecker/vendor/hunspell_dictionaries/README.txt</Path>
             <Path fileType="data">/usr/share/mailspring/resources/app.asar.unpacked/node_modules/@paulcbetts/spellchecker/vendor/hunspell_dictionaries/en-US.bdic</Path>
-            <Path fileType="data">/usr/share/mailspring/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node</Path>
-            <Path fileType="data">/usr/share/mailspring/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/obj.target/better_sqlite3.node</Path>
+            <Path fileType="data">/usr/share/mailspring/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Debug/better_sqlite3.node</Path>
+            <Path fileType="data">/usr/share/mailspring/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Debug/obj.target/better_sqlite3.node</Path>
             <Path fileType="data">/usr/share/mailspring/resources/app.asar.unpacked/node_modules/emoji-data/vendor/emoji-data/emoji.json</Path>
             <Path fileType="data">/usr/share/mailspring/resources/app.asar.unpacked/node_modules/jszip/vendor/FileSaver.js</Path>
             <Path fileType="data">/usr/share/mailspring/resources/app.asar.unpacked/node_modules/keyboard-layout/build/Release/keyboard-layout-manager.node</Path>
@@ -218,18 +219,19 @@
             <Path fileType="data">/usr/share/mailspring/swiftshader/libGLESv2.so</Path>
             <Path fileType="data">/usr/share/mailspring/v8_context_snapshot.bin</Path>
             <Path fileType="data">/usr/share/mailspring/version</Path>
+            <Path fileType="data">/usr/share/pixmaps/mailspring.png</Path>
         </Files>
         <Replaces>
             <Package>n1</Package>
         </Replaces>
     </Package>
     <History>
-        <Update release="33">
-            <Date>2020-06-07</Date>
-            <Version>1.7.8</Version>
+        <Update release="34">
+            <Date>2021-03-06</Date>
+            <Version>1.8.0</Version>
             <Comment>Packaging update</Comment>
-            <Name>Bryan T. Meyers</Name>
-            <Email>bmeyers@datadrake.com</Email>
+            <Name>Alec Scott</Name>
+            <Email>alec@bcs.sh</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file