diff --git a/srcpkgs/h2o/files/h2o.conf b/srcpkgs/h2o/files/h2o.conf
index fe7c245749b..df0b04e51ae 100644
--- a/srcpkgs/h2o/files/h2o.conf
+++ b/srcpkgs/h2o/files/h2o.conf
@@ -5,5 +5,5 @@ hosts:
   localhost:
     paths:
       /:
-        file.dir: /srv/http
+        file.dir: /srv/www/h2o
     access-log: /var/log/h2o/localhost.log
diff --git a/srcpkgs/h2o/files/h2o/run b/srcpkgs/h2o/files/h2o/run
index c7b630ab4e5..3ba20c30148 100644
--- a/srcpkgs/h2o/files/h2o/run
+++ b/srcpkgs/h2o/files/h2o/run
@@ -1,3 +1,10 @@
 #!/bin/sh
 
+[ -s conf ] && . ./conf
+
+: ${LOGDIR:=/var/log/h2o}
+
+mkdir -p $LOGDIR
+chown h2o:h2o $LOGDIR
+
 exec h2o -c /etc/h2o.conf
diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index b3474438172..abb04cbfaa9 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,12 +1,11 @@
 # Template file for 'h2o'
 pkgname=h2o
 version=1.7.1
-revision=2
+revision=3
 build_style=cmake
 conf_files="/etc/h2o.conf"
 system_accounts="h2o"
-make_dirs="/var/log/h2o 0750 root root"
-hostmakedepends="cmake pkg-config"
+hostmakedepends="pkg-config"
 makedepends="zlib-devel libressl-devel"
 depends="perl"
 short_desc="An optimized HTTP server with support for HTTP/1.x and HTTP/2"