diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index e13b6f101..3ac69d8ae 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -1,6 +1,5 @@
 # vim: set ts=2 sw=2 et:
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Maintainer: 
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - arch/host/flags for arm, armv6h, armv7h, and aarch64
@@ -12,7 +11,7 @@
 
 pkgname=pacman
 pkgver=5.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 url="https://www.archlinux.org/pacman/"
@@ -35,14 +34,14 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig
         0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch
         pacman.conf
         makepkg.conf
-        pacman-5.2.2-fix-strip-messing-up-file-attributes.patch::'https://git.archlinux.org/pacman.git/patch/?id=88d054093c1c99a697d95b26bd9aad5bc4d8e170')
+        pacman-5.2.2-fix-strip-messing-up-file-attributes.patch::'https://git.archlinux.org/pacman.git/patch/?id=88d054093c1c99a697d95b26bd9aad5bc4d8e170')  
 sha256sums=('bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0'
             'SKIP'
             '187bef40b14461ef7caba83e8124b6725e0cc9d46fa84353dae3b2afdc013589'
             '83597d3092edb2414d3b1a3e2e7337c0edcf102636a5884f3d3f3755fdceb2b0'
             '6e6434d123dd57961922627b39d967de384e3902a041e12dfc077081552fec28'
             '7210ba34cc95650425b9be1e9f87f77637348b8bd77c8cb68ab293ac08871aee'
-            '61ef049db84df9fcc237c037e0ed652b5ee9dc27d3b5d06e73ab0012adce2307'
+            '636ed8abfb219770251df5fb46cf6e7717aec9329526c5a13cbf223ad9950878'
             '871fd97b3f13f1718358e4b8e046a56c0262c9042b5e3b5d60835606735798bd')
 
 prepare() {
diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf
index 8fe15886c..84594b74c 100644
--- a/core/pacman/makepkg.conf
+++ b/core/pacman/makepkg.conf
@@ -38,9 +38,12 @@ CHOST="@CHOST@"
 #-- Compiler and Linker Flags
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
-CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="@CARCHFLAGS@-O2 -pipe -fstack-protector-strong -fno-plt"
-CXXFLAGS="@CARCHFLAGS@-O2 -pipe -fstack-protector-strong -fno-plt"
+CPPFLAGS=""
+CFLAGS="@CARCHFLAGS@-O2 -pipe -fstack-protector-strong -fno-plt -fexceptions \
+        -Wp,-D_FORTIFY_SOURCE=2,-D_GLIBCXX_ASSERTIONS \
+        -Wformat -Werror=format-security \
+        -fstack-clash-protection"
+CXXFLAGS="$CFLAGS"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems