diff --git a/config/logrotate b/config/logrotate
index 3c47a025..2d43888a 100644
--- a/config/logrotate
+++ b/config/logrotate
@@ -1,4 +1,4 @@
-/var/log/shiny-server.log {
+/var/log/shiny-server/shiny-server.log {
        rotate 12
        copytruncate
        compress
diff --git a/config/systemd/shiny-server.service b/config/systemd/shiny-server.service
index b87d7cae..425b70ed 100644
--- a/config/systemd/shiny-server.service
+++ b/config/systemd/shiny-server.service
@@ -3,7 +3,7 @@ Description=ShinyServer
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/env bash -c 'exec /opt/shiny-server/bin/shiny-server >> /var/log/shiny-server.log 2>&1'
+ExecStart=/usr/bin/env bash -c 'exec /opt/shiny-server/bin/shiny-server >> /var/log/shiny-server/shiny-server.log 2>&1'
 KillMode=process
 ExecReload=/usr/bin/env kill -HUP $MAINPID
 ExecStopPost=/usr/bin/env sleep 5
diff --git a/config/upstart/shiny-server.conf b/config/upstart/shiny-server.conf
index 74f6df3c..96b00e03 100644
--- a/config/upstart/shiny-server.conf
+++ b/config/upstart/shiny-server.conf
@@ -19,7 +19,7 @@ post-start script
     done
 end script 
   
-exec shiny-server --pidfile=/var/run/shiny-server.pid >> /var/log/shiny-server.log 2>&1
+exec shiny-server --pidfile=/var/run/shiny-server.pid >> /var/log/shiny-server/shiny-server.log 2>&1
 
 respawn limit 3 30
 
diff --git a/samples/welcome.html b/samples/welcome.html
index 1456546b..a716f01a 100644
--- a/samples/welcome.html
+++ b/samples/welcome.html
@@ -99,7 +99,7 @@ <h1>Welcome to Shiny Server!</h1>
         <h2>What's Next?</h2>
         Now you're ready to setup Shiny &mdash; if you haven't already &mdash; and start deploying your Shiny applications.
         <p>If you see a Shiny application running on the right side of this page, then Shiny is configured properly on your server and already running an example. Bravo! You can see this application on your server at <a href="./sample-apps/hello/">/sample-apps/hello/</a>.</p>
-        <p>If you see a gray box or an error message, then there's a bit more work to do to get Shiny running fully. You can continue with <a href="https://www.rstudio.com/products/shiny/download-server/">the installation instructions</a> or use <a href="http://docs.rstudio.com/shiny-server/">the Admin Guide</a> for more information. If you're seeing an error message in the panel to the right, you can use it to help diagnose what may be wrong. If you think Shiny is installed and setup properly and things still aren't working, you can look in the Shiny Server log which may have more information about what's wrong. By default, the log is stored in <code>/var/log/shiny-server.log</code>.</p>
+        <p>If you see a gray box or an error message, then there's a bit more work to do to get Shiny running fully. You can continue with <a href="https://www.rstudio.com/products/shiny/download-server/">the installation instructions</a> or use <a href="http://docs.rstudio.com/shiny-server/">the Admin Guide</a> for more information. If you're seeing an error message in the panel to the right, you can use it to help diagnose what may be wrong. If you think Shiny is installed and setup properly and things still aren't working, you can look in the Shiny Server log which may have more information about what's wrong. By default, the log is stored in <code>/var/log/shiny-server/shiny-server.log</code>.</p>
         <p>If you're really stuck <em>and you've read the relevant sections in <a href="http://docs.rstudio.com/shiny-server/">the Admin Guide</a></em> then please ask for help on our <a href="https://community.rstudio.com/c/shiny">RStudio Community forum</a>.</p>
         
         <h2><pre>rmarkdown</pre></h2>