diff --git a/etc/disable-common.inc b/etc/disable-common.inc
index a9567c0a4..c7f36bbfd 100644
--- a/etc/disable-common.inc
+++ b/etc/disable-common.inc
@@ -1,55 +1,9 @@
-# various programs
-blacklist  ${HOME}/.config/vlc
-
 # History files in $HOME
 blacklist-nolog ${HOME}/.history
 blacklist-nolog ${HOME}/.*_history
 
-# HTTP / FTP / Mail
-blacklist-nolog ${HOME}/.adobe
-blacklist-nolog ${HOME}/.macromedia
-blacklist ${HOME}/.icedove
-blacklist ${HOME}/.thunderbird
-blacklist ${HOME}/.sylpheed-2.0
-blacklist ${HOME}/.config/midori
-
-blacklist ${HOME}/.mozilla
-blacklist ${HOME}/.config/chromium
-blacklist ${HOME}/.config/google-chrome
-blacklist ${HOME}/.config/google-chrome-beta
-blacklist ${HOME}/.config/google-chrome-unstable
-blacklist ${HOME}/.config/opera
-blacklist ${HOME}/.config/opera-beta
-blacklist ~/.config/vivaldi
-
-blacklist ${HOME}/.filezilla
-blacklist ${HOME}/.config/filezilla
 blacklist ${HOME}/.local/share/systemd
 
-# Instant Messaging
-blacklist ${HOME}/.config/hexchat
-blacklist ${HOME}/.mcabber
-blacklist ${HOME}/.purple
-blacklist ${HOME}/.config/psi+
-blacklist ${HOME}/.retroshare
-blacklist ${HOME}/.weechat
-blacklist ${HOME}/.config/xchat
-blacklist ${HOME}/.Skype
-blacklist ${HOME}/.config/tox
-
-# Cryptocoins
-blacklist ${HOME}/.*coin
-blacklist ${HOME}/.electrum*
-blacklist ${HOME}/wallet.dat
-
-# VNC
-blacklist ${HOME}/.remmina
-
-# Other
-blacklist ${HOME}/.tconn
-blacklist ${HOME}/.FBReader
-blacklist ${HOME}/.wine
-
 # X11 session autostart
 blacklist ${HOME}/.xinitrc
 blacklist ${HOME}/.xprofile
@@ -70,11 +24,6 @@ blacklist ${HOME}/.VirtualBox
 blacklist ${HOME}/VirtualBox VMs
 blacklist ${HOME}/.config/VirtualBox
 
-# git, subversion
-blacklist ${HOME}/.subversion
-blacklist ${HOME}/.gitconfig
-blacklist ${HOME}/.git-credential-cache
-
 # var
 blacklist /var/spool/cron
 blacklist /var/spool/anacron
@@ -132,12 +81,3 @@ read-only ${HOME}/.xscreensaver
 # The user ~/bin directory can override commands such as ls
 read-only ${HOME}/bin
 
-# cache
-blacklist ~/.cache/mozilla
-blacklist ~/.cache/chromium
-blacklist ~/.cache/google-chrome
-blacklist ~/.cache/google-chrome-beta
-blacklist ~/.cache/google-chrome-unstable
-blacklist ~/.cache/opera
-blacklist ~/.cache/opera-beta
-blacklist ~/.cache/vivaldi
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
new file mode 100644
index 000000000..6379253aa
--- /dev/null
+++ b/etc/disable-programs.inc
@@ -0,0 +1,56 @@
+# various programs
+blacklist  ${HOME}/.config/vlc
+blacklist ${HOME}/.remmina
+blacklist ${HOME}/.tconn
+blacklist ${HOME}/.FBReader
+blacklist ${HOME}/.wine
+
+# HTTP / FTP / Mail
+blacklist-nolog ${HOME}/.adobe
+blacklist-nolog ${HOME}/.macromedia
+blacklist ${HOME}/.icedove
+blacklist ${HOME}/.thunderbird
+blacklist ${HOME}/.sylpheed-2.0
+blacklist ${HOME}/.config/midori
+blacklist ${HOME}/.mozilla
+blacklist ${HOME}/.config/chromium
+blacklist ${HOME}/.config/google-chrome
+blacklist ${HOME}/.config/google-chrome-beta
+blacklist ${HOME}/.config/google-chrome-unstable
+blacklist ${HOME}/.config/opera
+blacklist ${HOME}/.config/opera-beta
+blacklist ~/.config/vivaldi
+blacklist ${HOME}/.filezilla
+blacklist ${HOME}/.config/filezilla
+
+# cache
+blacklist ~/.cache/mozilla
+blacklist ~/.cache/chromium
+blacklist ~/.cache/google-chrome
+blacklist ~/.cache/google-chrome-beta
+blacklist ~/.cache/google-chrome-unstable
+blacklist ~/.cache/opera
+blacklist ~/.cache/opera-beta
+blacklist ~/.cache/vivaldi
+
+# Instant Messaging
+blacklist ${HOME}/.config/hexchat
+blacklist ${HOME}/.mcabber
+blacklist ${HOME}/.purple
+blacklist ${HOME}/.config/psi+
+blacklist ${HOME}/.retroshare
+blacklist ${HOME}/.weechat
+blacklist ${HOME}/.config/xchat
+blacklist ${HOME}/.Skype
+blacklist ${HOME}/.config/tox
+
+# Cryptocoins
+blacklist ${HOME}/.*coin
+blacklist ${HOME}/.electrum*
+blacklist ${HOME}/wallet.dat
+
+# git, subversion
+blacklist ${HOME}/.subversion
+blacklist ${HOME}/.gitconfig
+blacklist ${HOME}/.git-credential-cache
+