diff --git a/community/codeblocks/PKGBUILD b/community/codeblocks/PKGBUILD
index a52cc50ec..ca1cfa64e 100644
--- a/community/codeblocks/PKGBUILD
+++ b/community/codeblocks/PKGBUILD
@@ -7,11 +7,11 @@
 # Contributor: Roman Mikhayloff <rimf@inbox.ru>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - comment out x86 cflags
+#  - comment out x86 cflags, just switch to -O0
 
 pkgname=codeblocks
 pkgver=16.01
-pkgrel=7
+pkgrel=7.1
 pkgdesc='Cross-platform C/C++ IDE'
 arch=('x86_64' 'i686')
 url='http://www.codeblocks.org/'
@@ -33,6 +33,7 @@ build() {
   #export CFLAGS="-mtune=generic -O0 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
   #export CXXFLAGS="-mtune=generic -O0 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
   #export LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
+  CFLAGS=`echo $CFLAGS | sed -e 's/-O2/-O0/'` && CXXFLAGS="$CFLAGS"
 
   ./bootstrap
   ./configure --prefix=/usr --with-contrib-plugins=all