diff --git a/files/0001-Only-attempt-avx2_lib_shift-if-installdir-libdir-exi.patch b/files/0001-Only-attempt-avx2_lib_shift-if-installdir-libdir-exi.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-Only-attempt-avx2_lib_shift-if-installdir-libdir-exi.patch
@@ -0,0 +1,33 @@
+From 31708fa0f2b5161847ff7f9d1a63a591ccab52a2 Mon Sep 17 00:00:00 2001
+From: Joey Riches <josephriches@gmail.com>
+Date: Fri, 23 Jul 2021 15:22:14 +0100
+Subject: [PATCH 1/2] Only attempt avx2_lib_shift if $installdir/%libdir%
+ exists
+
+Otherwise we are trying to move files around which don't exist
+---
+ ypkg2/rc.yml | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/ypkg2/rc.yml b/ypkg2/rc.yml
+index bf91d2c..5432669 100644
+--- a/ypkg2/rc.yml
++++ b/ypkg2/rc.yml
+@@ -319,9 +319,11 @@ actions:
+             echo "\n\nError: Profiling requested by ypkg but doesn't exist\n\n"
+         fi
+     - avx2_lib_shift: |
+-        install -dm00755 $PKG_BUILD_DIR/haswell
+-        mv %installroot%/%libdir%/* $PKG_BUILD_DIR/haswell
+-        mv $PKG_BUILD_DIR/haswell %installroot%/%libdir%/
++        if [ -d "%installroot%/%libdir%" ]; then
++          install -dm00755 $PKG_BUILD_DIR/haswell
++          mv %installroot%/%libdir%/* $PKG_BUILD_DIR/haswell
++          mv $PKG_BUILD_DIR/haswell %installroot%/%libdir%/
++        fi
+ defines:
+     - CONFOPTS: |
+         --prefix=%PREFIX% --build=%HOST% --libdir=%libdir% --mandir=/usr/share/man \
+-- 
+2.32.0
+
diff --git a/files/0002-Add-python3_avx2_lib_shift-macro.patch b/files/0002-Add-python3_avx2_lib_shift-macro.patch
new file mode 100644
--- /dev/null
+++ b/files/0002-Add-python3_avx2_lib_shift-macro.patch
@@ -0,0 +1,26 @@
+From 62a92003f947bbf9bce4d8bd29af42ecfb8f7df0 Mon Sep 17 00:00:00 2001
+From: Joey Riches <josephriches@gmail.com>
+Date: Fri, 23 Jul 2021 15:24:26 +0100
+Subject: [PATCH 2/2] Add python3_avx2_lib_shift macro
+
+This appends python solib files with an avx2 extension.
+---
+ ypkg2/rc.yml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ypkg2/rc.yml b/ypkg2/rc.yml
+index 5432669..8dc8d94 100644
+--- a/ypkg2/rc.yml
++++ b/ypkg2/rc.yml
+@@ -324,6 +324,8 @@ actions:
+           mv %installroot%/%libdir%/* $PKG_BUILD_DIR/haswell
+           mv $PKG_BUILD_DIR/haswell %installroot%/%libdir%/
+         fi
++    - python3_avx2_lib_shift: |
++        find %installroot%/usr/lib/python%python3_version%/ -name '*.so' -exec sh -c 'mv "$0" "${0%.so}.so.avx2"' {} \;
+ defines:
+     - CONFOPTS: |
+         --prefix=%PREFIX% --build=%HOST% --libdir=%libdir% --mandir=/usr/share/man \
+-- 
+2.32.0
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : ypkg
 version    : 30
-release    : 138
+release    : 139
 source     :
     - git|https://github.com/getsolus/ypkg.git : 0c0e5871a048a1f5fa0fe11c3466a2276e8f53dd
 license    : GPL-3.0-or-later
@@ -17,6 +17,8 @@
     - ruamel_yaml
 setup      : |
     %patch -p1 < $pkgfiles/profile-intru-ldflags.patch
+    %patch -p1 < $pkgfiles/0001-Only-attempt-avx2_lib_shift-if-installdir-libdir-exi.patch
+    %patch -p1 < $pkgfiles/0002-Add-python3_avx2_lib_shift-macro.patch
     %python_setup
 install    : |
     %python_install
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -65,8 +65,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="138">
-            <Date>2021-02-18</Date>
+        <Update release="139">
+            <Date>2021-07-23</Date>
             <Version>30</Version>
             <Comment>Packaging update</Comment>
             <Name>Joey Riches</Name>