diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a328a89c..8241be172 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [Unreleased]
+### Fixed
+- Upstream patch from Debian bug #837206 to fix DB and log file
+  permissions. Also switch to new setup command.
+
 ## [0.11.0] - 2016-09-21
 ### Added
 - Added loading icon for other busy operations.
@@ -130,6 +135,7 @@ All notable changes to this project will be documented in this file.
 - Fixed issue that could allow someone to start a module setup process
   without being logged in to Plinth.
 
+[Unreleased]: https://github.com/freedombox/Plinth/compare/v0.11.0...HEAD
 [0.11.0]: https://github.com/freedombox/Plinth/compare/v0.10.0...v0.11.0
 [0.10.0]: https://github.com/freedombox/Plinth/compare/v0.9.4...v0.10.0
 [0.9.4]: https://github.com/freedombox/Plinth/compare/v0.9.3...v0.9.4
diff --git a/data/usr/lib/freedombox/setup.d/86_plinth b/data/usr/lib/freedombox/setup.d/86_plinth
index 397470b0b..886a059c5 100755
--- a/data/usr/lib/freedombox/setup.d/86_plinth
+++ b/data/usr/lib/freedombox/setup.d/86_plinth
@@ -36,7 +36,10 @@ echo "Done configuring Apache for Plinth."
 
 echo "Running Plinth setup..."
 
-# Run plinth setup to install various necessary program
-plinth --setup
+# Run plinth setup to configure various necessary program
+plinth --setup-no-install
+
+# Ensure that DB and log file permissions are correct
+chown -R plinth: /var/lib/plinth /var/log/plinth
 
 echo "Done running Plinth setup."