diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 1c8b5f8..f263798 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -4,14 +4,14 @@
 
 pkgname=grafana
 pkgver=7.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB'
 url='https://grafana.com/'
 arch=('x86_64')
 license=('Apache')
 depends=('glibc' 'freetype2' 'fontconfig' 'gsfonts')
 makedepends=('git' 'go' 'npm' 'grunt-cli' 'python' 'nodejs-lts-erbium')
-backup=('etc/grafana.ini')
+backup=('etc/grafana/grafana.ini')
 source=("git+https://github.com/grafana/grafana.git#tag=v$pkgver?signed"
         'grafana.service'
         'grafana.sysusers'
@@ -19,7 +19,7 @@ source=("git+https://github.com/grafana/grafana.git#tag=v$pkgver?signed"
        )
 install=$pkgname.install
 sha512sums=('SKIP'
-            '02a597225ee6ba8da9491a94daa33fe681846e2140e02fbb461ff7d39acd4cf99694dc03fb5f2c5ecfd180b09c44a41fe639b121499b4222b67ada57dc60d850'
+            'cd277064cfd851248a86f92110065b40cd919ee83a1a828ec0df4985ce24bbf95525b25b13fc4758b1abc09abd234c8346cf850da92879113315f9cd4d57e4e5'
             '38b46d953837a7afa5a654dfeef163b210d56cad57d937018531d00cd63b5341d6f9cd777299bdc7a994d0cb7df09b8157aad0f166e76ad47564e1ad6d5441d4'
             'c1724bfc7cbd6a406f17acb661efca0f1e57e2c30cc1841f4cb7ccfc420adc40cc61cb1c023d00444827b2c40e9caa4c2fefbfd503419848c74a0b455b2375ab')
 validpgpkeys=("D45B6DC53E9057C46487E25CE17E9ABACEFA59EB"
@@ -80,7 +80,9 @@ package() {
   cd $pkgname
   install -Dsm755 bin/linux-amd64/grafana-server "$pkgdir/usr/bin/grafana-server"
   install -Dsm755 bin/linux-amd64/grafana-cli "$pkgdir/usr/bin/grafana-cli"
-  install -Dm640 -o207 -g207 conf/sample.ini "$pkgdir/etc/$pkgname.ini"
+  install -Dm640 -o207 -g207 conf/sample.ini "$pkgdir/etc/$pkgname/$pkgname.ini"
+  install -Dm640 -o207 -g207 conf/ldap.toml "$pkgdir/etc/$pkgname/ldap.toml"
+  cp -a conf/provisioning "$pkgdir/etc/$pkgname/"
   install -Dm644 conf/defaults.ini "$pkgdir/usr/share/$pkgname/conf/defaults.ini"
   install -dm755 "$pkgdir/usr/share/grafana/"
   for i in public tools; do
diff --git a/trunk/grafana.install b/trunk/grafana.install
index 5656308..0bc153b 100644
--- a/trunk/grafana.install
+++ b/trunk/grafana.install
@@ -16,6 +16,14 @@ post_upgrade() {
     fi
     echo '==> Check the ownership of your files!'
   fi
+  if (( "$(vercmp $2 7.0.6-2)" < 0 )); then
+    echo '==> Grafana configuration is now in a subdirectory'
+    if [ -f /etc/grafana.ini.pacsave ] &&
+      ! mv /etc/grafana.ini.pacsave /etc/grafana/grafana.ini; then
+      echo '==> Automatic migration failed. Do it manually!'
+      echo '==> mv /etc/grafana.ini.pacsave /etc/grafana/'
+    fi
+  fi
   return 0
 }