diff --git a/blender.spec b/blender.spec
index 9315b04..5b71e69 100644
--- a/blender.spec
+++ b/blender.spec
@@ -31,33 +31,11 @@ URL:        http://www.blender.org
 Source0:    http://download.%{name}.org/source/%{name}-%{version}.tar.gz
 Source2:    %{name}-fonts.metainfo.xml
 Source5:    %{name}.xml
-Source6:    %{name}.appdata.xml
 Source10:   macros.%{name}
 
 Patch0:     %{name}-2.80-droid.patch
-#Patch1:     %%{name}-2.79-thumbnailer.patch
-Patch2:     %{name}-2.80-scripts.patch
-Patch3:     %%{name}-2.80-locale.patch
-#Patch4:     %%{name}-2.79-manpages.patch
-#Patch5:     %%{name}-2.79-unversioned-system-path.patch
-#Patch6:     %%{name}-2.79-openvdb3-abi.patch
-# Backported patch for openjpeg2 support from
-# https://lists.blender.org/pipermail/bf-blender-cvs/2016-July/088691.html
-# but without patch-updating the bundled openjpeg2 version
-#Patch7:     blender-2.79-openjpeg2.patch
-#Patch8:     util_sseb.patch
-#Patch9:     tree_hpp.patch
-# Backported from https://developer.blender.org/rB1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f
-#Patch10:     %%{name}-2.79-python37.patch
-# Patch mostly from upstream, for more details see:
-# https://developer.blender.org/rB66d8bfb85c61aafe3bad2edf0e7b4d9d694ee2e7
-# https://github.com/OpenImageIO/oiio/wiki/OIIO-2.0-Porting-Guide
-#Patch11:     blender-oiio2.patch
-# Commit to make OpenGL_GL_PREFERENCES=GLVND work
-# https://developer.blender.org/rB0658d047a94a86060f039790898a80a7adb0dcd9
-# Patch12:     blender-cmake_opengl.patch
-# Patch to build with GCC9
-#Patch13:     0001-Fix-for-GCC9-new-OpenMP-data-sharing.patch
+Patch1:     %{name}-2.80-scripts.patch
+Patch2:     %%{name}-2.80-locale.patch
 
 # Development stuff
 BuildRequires:  boost-devel
@@ -144,10 +122,6 @@ Requires:       python3-numpy
 Requires:       python3-requests
 Provides:       blender(ABI) = %{blender_api}
 
-# Temporarily disable some secondary architectures
-# until the issue gets resolved
-ExcludeArch:	ppc64le s390x
-
 %description
 Blender is the essential software solution you need for 3D, from modeling,
 animation, rendering and post-production to interactive creation and playback.
@@ -222,7 +196,7 @@ pushd cmake-make
     -DWITH_INPUT_NDOF=ON \
     -DWITH_INSTALL_PORTABLE=OFF \
     -DWITH_JACK=ON \
-    -DWITH_MEM_JEMALLOC=ON \
+    -DWITH_MEM_JEMALLOC=OFF \
     -DWITH_MOD_OCEANSIM=ON \
     -DWITH_OPENCOLLADA=OFF \
     -DWITH_OPENCOLORIO=OFF \
@@ -259,7 +233,7 @@ mkdir -p %{buildroot}%{macrosdir}
 sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE10} > %{buildroot}%{macrosdir}/macros.%{name}
 
 # AppData
-install -p -m 644 -D %{SOURCE6} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+install -p -m 644 -D release/freedesktop/org.%{name}.Blender.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 install -p -m 644 -D %{SOURCE2} %{buildroot}%{_datadir}/metainfo/%{name}-fonts.metainfo.xml
 
 # Localization
@@ -323,7 +297,11 @@ fi
 %{_fontbasedir}/%{name}/
 
 %changelog
-* Thu Aug 15 2019 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.80-5
+* Thu Oct 10 2019 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.80-6
+- Drop downstream appdata in favor of upstream version
+- Clean up spec file
+
+* Thu Oct 10 2019 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.80-5
 - Disable several dependencies missing in epel8 repository
 
 * Thu Aug 15 2019 Luya Tshimbalanga <luya@fedoraproject.org> - 1:2.80-4