diff --git a/gitea/default/PKGBUILD b/gitea/default/PKGBUILD
index b8e3fad3..3e814140 100644
--- a/gitea/default/PKGBUILD
+++ b/gitea/default/PKGBUILD
@@ -8,7 +8,7 @@ _gourl=code.$_pkgname.io/$_pkgname
 
 pkgname=${_pkgname}
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 #epoch=
 pkgdesc='Self Hosted Git Service written in Go'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
@@ -23,7 +23,7 @@ optdepends=('sqlite: SQLite support'
             'openssh: GIT over SSH support')
 makedepends=('go>=1.3')
 conflicts=("$_pkgname-bin" "$_pkgname-git" "$_pkgname-dev-git")
-options=('!strip' '!emptydirs')
+options=('!strip')
 backup=("etc/$_pkgname/app.ini")
 install=$_pkgname.install
 source=("$_pkgname-$pkgver::https://github.com/$_orga/$_pkgname/archive/v${pkgver}.tar.gz"
@@ -84,4 +84,7 @@ package() {
   install -Dm0644 "$pkgdir/usr/share/$_pkgname/conf/app.ini" "$pkgdir/etc/$_pkgname/app.ini"
   install -Dm0644 "$srcdir/build/src/${_gourl}/scripts/systemd/$_pkgname.service" "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
   install -Dm0644 "$srcdir/build/src/${_gourl}/LICENSE" "$pkgdir/usr/share/licenses/$_pkgname"
+
+  install -dm0700 "$pkgdir/var/log/$_pkgname"
+  install -dm0700 "$pkgdir/var/lib/$_pkgname"
 }
diff --git a/gitea/default/gitea.install b/gitea/default/gitea.install
index 9550b66c..97cc22e9 100644
--- a/gitea/default/gitea.install
+++ b/gitea/default/gitea.install
@@ -9,7 +9,6 @@ pre_install() {
 }
 
 post_install(){
-  mkdir -p /var/log/gitea
   chown -R gitea:gitea /var/log/gitea
   chown -R gitea:gitea /var/lib/gitea
 
diff --git a/gogs/default/PKGBUILD b/gogs/default/PKGBUILD
index 085fb928..70ec01c6 100644
--- a/gogs/default/PKGBUILD
+++ b/gogs/default/PKGBUILD
@@ -8,7 +8,7 @@ _gourl=github.com/gogits/$_pkgname
 
 pkgname=$_pkgname
 pkgver=0.11.19
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Self Hosted Git Service written in Go'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
@@ -23,7 +23,7 @@ optdepends=('sqlite: SQLite support'
             'openssh: GIT over SSH support')
 makedepends=('go>=1.3')
 conflicts=("$_pkgname-bin" "$_pkgname-git" "$_pkgname-dev-git")
-options=('!strip' '!emptydirs')
+options=('!strip')
 backup=("etc/$_pkgname/app.ini")
 install=$_pkgname.install
 source=("$_pkgname-$pkgver::https://github.com/$_orga/$_pkgname/archive/v${pkgver}.tar.gz"
@@ -84,4 +84,7 @@ package() {
   install -Dm0644 "$pkgdir/usr/share/$_pkgname/conf/app.ini" "$pkgdir/etc/$_pkgname/app.ini"
   install -Dm0644 "$srcdir/build/src/${_gourl}/scripts/systemd/$_pkgname.service" "$pkgdir/usr/lib/systemd/system/$_pkgname.service"
   install -Dm0644 "$srcdir/build/src/${_gourl}/LICENSE" "$pkgdir/usr/share/licenses/$_pkgname"
+
+  install -dm0700 "$pkgdir/var/log/$_pkgname"
+  install -dm0700 "$pkgdir/var/lib/$_pkgname"
 }
diff --git a/gogs/default/gogs.install b/gogs/default/gogs.install
index 0135c975..46f6cdf4 100644
--- a/gogs/default/gogs.install
+++ b/gogs/default/gogs.install
@@ -9,7 +9,6 @@ pre_install() {
 }
 
 post_install(){
-  mkdir -p /var/log/gogs
   chown -R gogs:gogs /var/log/gogs
   chown -R gogs:gogs /var/lib/gogs