diff --git a/release/handbrake.xml b/release/handbrake.xml
index ce3ddfa..a6487ef 100644
--- a/release/handbrake.xml
+++ b/release/handbrake.xml
@@ -2,12 +2,8 @@
 <!--
 
     BleachBit
-    Copyright (C) 2013 Andrew Ziem
-    http://www.bleachbit.org
-
-    Cleaner for HandBrake
-    Copyright © 2012-2013 Rogério Theodoro de Brito.
-    Copyright © 2016 Erratalog
+    Copyright (C) 2008-2019 Andrew Ziem
+    https://www.bleachbit.org
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,26 +18,83 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+    @app HandBrake
+    @url https://handbrake.fr/
+    @os Windows, Linux
+    @cleanerversion v1.0.0
+    @cleanerdate 2019-03-21
+    @cleanerby Rogério Theodoro de Brito (2012 - 2013) & Erratalog (2016) & Tobias B. Besemer (2019-03-18 - 2019-03-21)
+    @tested ok v???, Windows ???
+    @testeddate ???
+    @testedby ???
+    @note Linux $$ProgramFiles$$ not yet figured out! I will do this later! Tobias.
+    @note This cleaner makes the WinApp2.ini entries to Handbrake no more necessary!
+
 -->
 <cleaner id="handbrake">
   <label>HandBrake</label>
   <description>Video transcoder</description>
+  <!-- Not yet figured out:
+  <running type="exe" os="linux">handbrake</running>
+  -->
+  <running type="exe" os="windows">Handbrake</running>
+  <var name="ProgramFiles">
+    <!--
+    Windows itself changes %ProgramFiles% for 32-bit processes running in a 64-bit operating system as documented here:
+    https://docs.microsoft.com/en-us/windows/desktop/winprog64/wow64-implementation-details
+    ...so we used "%SystemDrive%\Program Files\" & "%SystemDrive%\Program Files (x86)\"...
+    <value os="windows">%SystemDrive%\Program Files\[ProgramName]</value>
+    <value os="windows">%SystemDrive%\Program Files (x86)\[ProgramName]</value>
+    ...but %ProgramFiles% & %ProgramFiles(x86)% don't need to be on %SystemDrive% !!!
+    So we use: -->
+    <value os="windows">%ProgramW6432%\HandBrake</value>
+    <!-- ...that BleachBit as 32-bit program can find "\Program Files\HandBrake" and... -->
+    <value os="windows">%ProgramFiles(x86)%\HandBrake</value>
+    <!-- ...that BleachBit can find "\Program Files (x86)\HandBrake" and... -->
+    <value os="windows">%ProgramFiles%\HandBrake</value>
+    <!-- ...that BleachBit can find "\Program Files\HandBrake" on a x86 system...
+    ...and later, as 64-bit program, "\Program Files\HandBrake" (x64)!
+    So all cases solved! ;-) Tobias. -->
+    <!--
+    Linux $$ProgramFiles$$ not yet figured out! I will do this later! Tobias.
+    <value os="linux">~/.config/ghb</value>
+    -->
+  </var>
   <option id="logs">
-    <label>Remove old logs</label>
-    <description>Remove logs of old transcodings</description>
-    <!-- Linux -->
+    <label>Logs</label>
+    <description>Delete the logs</description>
+    <!-- Linux: -->
     <action command="delete" search="glob" path="~/.config/ghb/Activity.log.*"/>
-    <action command="delete" search="walk.all" path="~/.config/ghb/EncodeLogs/"/>
-    <!-- Win -->
-    <action command="delete" search="walk.files" path="$APPDATA\HandBrake\logs\"/>
+    <action command="delete" search="walk.files" path="~/.config/ghb/EncodeLogs/"/>
+    <!-- Windows: -->
+    <action command="delete" search="walk.files" path="%AppData%\HandBrake\logs\"/>
+    <!-- Windows, old: -->
+    <action command="delete" search="walk.files" path="%AppData%\HandBrake Team\HandBrake\*\logs\"/>
   </option>
   <option id="queues">
-    <label>Remove queues of jobs</label>
-    <description>Remove queues of jobs</description>
-    <warning>Queues may contain transcoding jobs that were not yet completed and you will have to reschedule them</warning>
-    <!-- Linux -->
+    <label>Queues</label>
+    <description>Delete the files</description>
+    <!-- Linux: -->
     <action command="delete" search="glob" path="~/.config/ghb/queue.*"/>
-    <!-- Win -->
-    <action command="delete" search="glob" path="$APPDATA\HandBrake\hb_queue_recovery*.xml"/>
+    <!-- Windows: -->
+    <action command="delete" search="glob" path="%AppData%\HandBrake\hb_queue_recovery*.xml"/>
+    <!-- Windows, old: -->
+    <action command="delete" search="glob" path="%AppData%\HandBrake Team\HandBrake\*\hb_queue_recovery*.xml"/>
+  </option>
+  <option id="temp">
+    <label>Temporary files</label>
+    <description>Delete the temporary files</description>
+    <!-- Delete *.tmp recursive: -->
+    <action command="delete" search="walk.files" path="~/.config/ghb/" regex="\.[Tt][Mm][Pp]$"/>
+    <action command="delete" search="walk.files" path="%AppData%\HandBrake\" regex="\.[Tt][Mm][Pp]$"/>
+    <action command="delete" search="walk.files" path="%AppData%\HandBrake Team\" regex="\.[Tt][Mm][Pp]$"/>
+  </option>
+  <option id="crash_reports">
+    <label>Crash reports</label>
+    <description>Delete the files</description>
+    <!-- Also in WinApp2.ini/[HandBrake *]! Start... -->
+    <action command="delete" search="glob" path="$$ProgramFiles$$\*.stackdump"/>
+    <action command="delete" search="glob" path="%LocalAppData%\VirtualStore\Program Files*\HandBrake\*.stackdump"/>
+    <!-- ...end! Tobias. -->
   </option>
 </cleaner>