diff --git a/community/netdata/PKGBUILD b/community/netdata/PKGBUILD
index a5d2fb9bc..34bced821 100644
--- a/community/netdata/PKGBUILD
+++ b/community/netdata/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=netdata
 pkgver=1.20.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Real-time performance monitoring, in the greatest possible detail, over the web"
 url="https://github.com/netdata/netdata"
 arch=('x86_64')
@@ -31,6 +31,13 @@ sha512sums=('ada398cdccf1b1b4dbac5b24d4539f86aafb964458aa4f3bdfac336362504aab6d7
             '3f934ddd1f5248f9e11c29050c023d60b76e4098ec9c8d413bb362d43e9242f767fd58310d966076e8400779af8bda2459afcc314b267fcb9f1c84173e14e313'
             'a910809a823ba58ca7bdaa72e8d68427b48f452c1fbb2343fa182ecb0a091a7640e73af24b8ba2fdd90e00aed8ef53b7fccd25cb8f04ca9b9fa6c8e52223ca66')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  # Use advanced service file (FS#65027)
+  mv system/netdata.service.v235.in system/netdata.service.in
+}
+
 build() {
   cd "$pkgname-$pkgver"
 
@@ -52,7 +59,7 @@ package() {
 
   # Remove /var/*, pacman creates it via tmpfiles hook
   rm -vrf "${pkgdir}/var"
-  touch "$pkgdir/etc/netdata/netdata.conf"
+  install -Dm644 system/netdata.conf "$pkgdir"/etc/netdata/netdata.conf
   chown -R 134:134 "$pkgdir"/etc/netdata
   chown -R 134:134 "$pkgdir"/usr/share/netdata/web