diff --git a/debian/changelog b/debian/changelog
index ad82a7fa4..61223e725 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ jellyfin (10.0.0-1) unstable; urgency=medium
   * Numerous bugfixes and code readability improvements
   * Updated logging configuration, including flag for it and configdir
   * Updated theming including logo
-  * Dozens of other improvements as documented in PR#419
+  * Dozens of other improvements as documented in GitHub pull request #419
 
  -- Joshua Boniface <joshua@boniface.me>  Sat, 05 Jan 2019 15:39:25 -0500
 
diff --git a/debian/conf/jellyfin b/debian/conf/jellyfin
index 2735fe8e7..861865aae 100644
--- a/debian/conf/jellyfin
+++ b/debian/conf/jellyfin
@@ -15,11 +15,9 @@
 # General options
 #
 
-# Data directory
+# Program directories
 JELLYFIN_DATA_DIRECTORY="/var/lib/jellyfin"
-# Config directory
 JELLYFIN_CONFIG_DIRECTORY="/etc/jellyfin"
-# Logging directory
 JELLYFIN_LOG_DIRECTORY="/var/log/jellyfin"
 # Restart script for in-app server control
 JELLYFIN_RESTART_SCRIPT="/usr/lib/jellyfin/restart.sh"
diff --git a/debian/postrm b/debian/postrm
index cbf77325e..690f5d587 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -52,8 +52,10 @@ case "$1" in
     [[ -f /usr/bin/jellyfin ]] && rm /usr/bin/jellyfin
     # Remove sudoers config
     [[ -f /etc/sudoers.d/jellyfin-sudoers ]] && rm /etc/sudoers.d/jellyfin-sudoers
-    # Remove /var/lib/jellyfin, just in case
-    [[ -d /var/lib/jellyfin ]] && rm -rf /var/lib/jellyfin
+    # Remove anything at the default locations; catches situations where the user moved the defaults
+    [[ -e /etc/jellyfin ]] && rm -rf /etc/jellyfin
+    [[ -e /var/log/jellyfin ]] && rm -rf /var/log/jellyfin
+    [[ -e /var/lib/jellyfin ]] && rm -rf /var/lib/jellyfin
     ;;
   remove)
     if [[ -x "/usr/bin/deb-systemd-helper" ]]; then