Index: apps/features.txt
===================================================================
--- apps/features.txt	(revision 25371)
+++ apps/features.txt	(working copy)
@@ -20,6 +20,10 @@
 albumart
 #endif
 
+#if defined(HAVE_BACKLIGHT)
+backlight
+#endif
+
 #if defined(HAVE_BACKLIGHT_BRIGHTNESS)
 backlight_brightness
 #endif
Index: manual/advanced_topics/main.tex
===================================================================
--- manual/advanced_topics/main.tex	(revision 25371)
+++ manual/advanced_topics/main.tex	(working copy)
@@ -580,3 +580,82 @@
 
 \opt{archos}{\input{advanced_topics/archos-flashing.tex}}
 
+\section{\label{ref:OptimizeRuntime}Optimizing battery runtime}
+  Rockbox offers a lot of settings that have high impact on the battery runtime 
+  of your \dap{}. The largest power savings can be achieved through disabling
+  unneeded hardware components -- for some of those there are settings
+  available. 
+\opt{swcodec}{
+  Another area of savings is avoiding or reducing CPU boosting
+  through disabling computing intense features (e.g. sound processing) or 
+  using effective audio codecs. 
+} The following provides a short overview of the most relevant settings and 
+  rules of thumb.
+
+
+\subsection{Display backlight}
+\opt{backlight}{
+  The active backlight consumes a lot of power. Therefore choose a setting that
+  disables the backlight after timeout (for setting \setting{Backlight} see 
+  \reference{ref:Displayoptions}). Avoid to have the backlight enabled all the 
+  time.
+}
+
+\subsection{Display power-off}
+\opt{lcd_sleep}{
+  Shutting down the display and the display controller saves a reasonable amount 
+  of power. Choose a setting that will put the display to sleep after timeout
+  (for setting \setting{Sleep} see \reference{ref:Displayoptions}). Avoid to 
+  have the display enabled all the time -- even, if the display is transflective
+  and is readable without backlight. It is more efficient to re-enable the 
+  display and its backlight for a glimpse a few times per hour than to keep the 
+  display enabled.
+}
+
+\opt{accessory_supply}{
+\subsection{Accessory power supply}
+  As default your \dap{}'s accessory power supply is always enabled to ensure
+  proper function of connected accessory devices. Disable this power supply, if 
+  -- or as long as -- you do not use any accessory device with your \dap{} while 
+  running Rockbox (see \reference{ref:AccessoryPowerSupply}).
+}
+
+\opt{lineout_poweroff}{
+\subsection{Line Out}
+  Rockbox allows to switch off the line-out on your \dap{}. If you do not need 
+  the line-out, switch it off (see \reference{ref:LineoutOnOff}).
+}
+
+\opt{spdif_power}{
+\subsection{Optical Output}
+  Rockbox allows to switch off the S/PDIF output on your \dap{}. If you do not 
+  need this output, switch it off (see \reference{ref:SPDIF_OnOff}).
+}
+
+\opt{swcodec, disk_storage}{
+\subsection{Audio format and bitrate}
+\opt{swcodec}{
+  In general the fastest decoding audio format will be the best in terms of
+  battery runtime on your \dap{}. An overview of different codec's performance 
+  on different \dap{}s can be found at \wikilink{CodecPerformanceComparison}.
+}
+
+\opt{disk_storage}{
+  Your target uses a hard disk which consumes a large amount of power while
+  spinning. The less often the hard disk needs to spin up for buffering, the 
+  lower is the power consumption. Therefore the bitrate of the audio files 
+  does also have an impact on the battery runtime. The lower the bitrate of 
+  the audio files, the better the runtime.
+}
+
+  Please do not re-encode any existing audio files from one lossy format to 
+  another based upon the abvoe mentioned. Just take it into account when you
+  are ripping new files and have the choice.
+}
+
+\opt{swcodec}{
+\subsection{Sound settings}
+  In general all kinds of sound processing will need more CPU time and therefore
+  consume more power. The less sound processing you use, the better it is for 
+  the battery runtime (for options see \reference{ref:configure_rockbox_sound}).
+}
Index: manual/configure_rockbox/display_options.tex
===================================================================
--- manual/configure_rockbox/display_options.tex	(revision 25371)
+++ manual/configure_rockbox/display_options.tex	(working copy)
@@ -60,8 +60,8 @@
         \item[Sleep (After Backlight Off).]
         This setting controls how long rockbox will wait before turning off the
         display after the backlight is turned off. Turning off the display
-        saves a little bit of battery power but turning on the display takes
-        noticeably longer than just turning on the backlight.
+        saves battery power but turning on the display takes noticeably longer 
+        than just turning on the backlight.
       }
       
       \opt{backlight_brightness}{
Index: manual/configure_rockbox/system_options.tex
===================================================================
--- manual/configure_rockbox/system_options.tex	(revision 25371)
+++ manual/configure_rockbox/system_options.tex	(working copy)
@@ -152,7 +152,7 @@
 }
 
 \opt{accessory_supply}{
-\subsection{Accessory Power Supply}
+\subsection{\label{ref:AccessoryPowerSupply}Accessory Power Supply}
 This option turns the accessory power supply \setting{On} and \setting{Off}.
 The Apple accessory protocol has been partially implemented in Rockbox, and
 thus there is a reasonable chance that your favourite accessory will work.
@@ -162,7 +162,7 @@
 }
 
 \opt{lineout_poweroff}{
-\subsection{Line Out}
+\subsection{\label{ref:LineoutOnOff}Line Out}
 This option turns the \dap{}'s line-out \setting{On} and \setting{Off}. On some 
 devices an enabled line-out will consume some power even if not used. If it is 
 not required, then turning this setting \setting{Off} will save battery and 
Index: manual/configure_rockbox/playback_options.tex
===================================================================
--- manual/configure_rockbox/playback_options.tex	(revision 25371)
+++ manual/configure_rockbox/playback_options.tex	(working copy)
@@ -204,7 +204,7 @@
 }%\opt{swcodec}
 
 \opt{spdif_power}{
-  \section{Optical Output}
+  \section{\label{ref:SPDIF_OnOff}Optical Output}
     Enables or disables the optical S/PDIF output to 
     allow a digital connection to a suitable external decoder.  To enable
     optical output, set to \setting{Yes}