Index: manual/preamble.tex
===================================================================
--- manual/preamble.tex	(revision 16248)
+++ manual/preamble.tex	(working copy)
@@ -35,6 +35,7 @@
 \usepackage{optional}
 
 \input{platform/\platform.tex}
+\input{features.tex}
 
 \newcommand{\playername}{\playerman\ \playerlongtype}
 
Index: manual/Makefile
===================================================================
--- manual/Makefile	(revision 16248)
+++ manual/Makefile	(working copy)
@@ -7,12 +7,17 @@
 # $Id$
 #
 
+# Needed to build the features list.
+INCLUDES= $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(BUILDDIR)	\
+ -I$(BUILDDIR)/bitmaps -I$(OBJDIR)
 
 .PHONY: all buildmanual clean
 MANFILE := rockbox-build
 
 all: manual-pdf 
 
+features: $(OBJDIR)/features
+
 manual-prep: rockbox.tex
 	@if [ "$(OBJDIR)" = "" ]; then echo Run make in you build directory!; false; fi
 	@mkdir -p $(OBJDIR)
@@ -25,7 +30,15 @@
 	@printf "\\\\input{rockbox.tex}\n" >> $(OBJDIR)/$(MANFILE).tex
 	@mv $(OBJDIR)/Makefile.pdflatex $(OBJDIR)/Makefile
 
-manual-pdf: manual-prep rockbox.tex
+$(OBJDIR)/features: $(ROOTDIR)/apps/features.txt
+	$(SILENT)mkdir -p `dirname $@`
+	$(SILENT)cat $< | $(HOSTCC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \
+	$(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -imacros "config.h" -imacros "button.h" - | \
+	grep -v "^\#" | grep -v "^$$" > $@; \
+	for f in `cat $(OBJDIR)/features`; do feat="$$feat\n\\\edef\\UseOption{\\UseOption,$$f}" ; done ; \
+	echo -e "$$feat" >$(OBJDIR)/features.tex
+
+manual-pdf: features manual-prep rockbox.tex
 	$(MAKE) -C $(OBJDIR) buildmanual
 
 manual-html: manual-prep rockbox.tex
Index: tools/configure
===================================================================
--- tools/configure	(revision 16248)
+++ tools/configure	(working copy)
@@ -1577,9 +1577,6 @@
       echo "GDB stub build selected"
       ;;
     [Mm])
-      appsdir='\$(ROOTDIR)/manual'
-      firmdir='\$(ROOTDIR)/manual/platform' # No Makefile here.  Effectively ig:res target
-      toolsdir=$firmdir;
       toolset='';
       apps="manual"
       echo "Manual build selected"