diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index da25a9bba..d70bcda4c 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Tom Gundersen <teg@jklm.no>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - !distcc
+#  - disable optimization, currently breaks timesyncd over distcc
 
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
@@ -14,7 +14,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
              'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt'  'libmicrohttpd' 'libxslt'
              'util-linux' 'linux-api-headers' 'pam' 'python' 'python-lxml' 'quota-tools'
              'shadow' 'xz')
-options=('strip' 'debug' '!distcc')
+options=('strip' 'debug')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
@@ -35,6 +35,9 @@ prepare() {
 build() {
   cd "$pkgname-$pkgver"
 
+  CFLAGS=`echo $CFLAGS | sed -e 's/-O2/-O0/'` && CXXFLAGS="$CFLAGS"
+  unset CPPFLAGS
+
   ./configure \
       --libexecdir=/usr/lib \
       --localstatedir=/var \