diff --git a/package-with/conf.xml b/package-with/conf.xml
index b7bce47..67a9388 100644
--- a/package-with/conf.xml
+++ b/package-with/conf.xml
@@ -93,8 +93,8 @@
 
 		<!-- File location for logs. If not specified or left blank the error log 
 			will print to stdout and the access log to stderr -->
-		<error-log>/var/log/webdav-error.log</error-log>
-		<access-log>/var/log/webdav-access.log</access-log>
+		<error-log>/var/log/webdavd/error.log</error-log>
+		<access-log>/var/log/webdavd/access.log</access-log>
 
 		<!-- At least one of these must be configured if you want an SSL encrypted 
 			connection. Certificates MUST have a Subject Alternative Name specified. 
diff --git a/package-with/logrotate.conf b/package-with/logrotate.conf
index 343fa9e..56c93dc 100644
--- a/package-with/logrotate.conf
+++ b/package-with/logrotate.conf
@@ -1,8 +1,8 @@
-/var/log/webdav-access.log /var/log/webdav-error.log {
+/var/log/webdavd/access.log /var/log/webdavd/error.log {
         sharedscripts
         missingok
         delaycompress
-        create 640 root adm
+        create
 
         postrotate
 			service webdavd restart
diff --git a/package-with/pam-rhel.conf b/package-with/pam-rhel.conf
index 1daab90..0ba40d1 100644
--- a/package-with/pam-rhel.conf
+++ b/package-with/pam-rhel.conf
@@ -1,3 +1,11 @@
-auth		include	password-auth
-account		include	password-auth
-session		include	password-auth
+auth		substack	password-auth
+auth   		include		postlogin
+account		required	pam_sepermit.so
+account		include		password-auth
+session		required	pam_selinux.so close
+session		required 	pam_loginuid.so
+session		required	pam_selinux.so open env_params
+session		required	pam_namespace.so
+session		optional	pam_keyinit.so force revoke
+session		include		password-auth
+session		include		postlogin
diff --git a/package-with/systemd.service b/package-with/systemd.service
index b685661..fb631ff 100644
--- a/package-with/systemd.service
+++ b/package-with/systemd.service
@@ -1,13 +1,13 @@
 [Unit]
 Description=WebDAV file server
 Documentation=man:webdavd(1)
+After=network.target
 
 [Service]
 Type=simple
-#Environment=statedir=/var/cache/foo
-#iExecStartPre=/usr/bin/mkdir -p ${statedir}
 ExecStart=/usr/sbin/webdavd /etc/webdavd
+LogsDirectory=webdavd
+ProtectSystem=full
 
 [Install]
 WantedBy=multi-user.target
-