diff --git a/documentation/debugger.sgml b/documentation/debugger.sgml
index b2453d215ae..57cd930f0c5 100644
--- a/documentation/debugger.sgml
+++ b/documentation/debugger.sgml
@@ -490,15 +490,15 @@ winedbg "hl.exe -windowed"
         <para>
           The best, freely available, disassembler for Win16 programs is
           <application>Windows Codeback</application>, archive name
-          <filename>wcbxxx.zip</filename>, which usually can be found in
-          the <filename>Cica-Mirror</filename> subdirectory on the Wine
-          ftp sites. (See <filename>ANNOUNCE</filename>).
+          <filename>wcbxxx.zip</> (e.g. <filename>wcb105a.zip</>), which
+          usually can be found in the <filename>Cica-Mirror</filename>
+          subdirectory on the Wine ftp sites. (See <filename>ANNOUNCE</>).
         </para>
         <para>
           Disassembling win32 programs is possible using
-          <application>Windows Disassembler 32</application>, archive name
-          something like <filename>w32dsm87.zip</filename> (or similar)
-          on <systemitem class="systemname">ftp.winsite.com</systemitem>
+          <application>Windows Disassembler 32</>. Look for
+          a file called <filename>w32dsm87.zip</> (or similar)
+          on <ulink url="http://www.winsite.com/">http://www.winsite.com</>
           and mirrors.  The shareware version does not allow saving of
           disassembly listings. You can also use the newer (and in the
           full version better) <application>Interactive
diff --git a/documentation/default.dsl b/documentation/default.dsl
index f5c09610243..6e1eb9dd0c3 100644
--- a/documentation/default.dsl
+++ b/documentation/default.dsl
@@ -7,15 +7,21 @@
 <style-specification id="html" use="docbook">
 <style-specification-body>
 
+; Use the section id as the filename rather than
+; cryptic filenames like x1547.html
 (define %use-id-as-filename% #t)
-(define %html-ext% ".html")
-(define %html-header-tags% '())
+
+; Repeat the section number in each section to make it easier
+; when browsing the doc
+(define %section-autolabel% #t)
 
 ;;(define %stylesheet% "../../winehq.css")
 ;;(define %stylesheet-type% "text/css")
 
+; All that remains is to hard-code various aspects of the look and feel
+; (colors, italics, etc.)
+
 (define %shade-verbatim% #t)
-(define %section-autolabel% #t)
 
 ;; Customize the body tag color attributes
 (define %body-attr% 
@@ -37,33 +43,6 @@
    ;(list "BGCOLOR" "#FFE7BA")  ; wheat1 (light tan)
    (list "WIDTH" ($table-width$))))
 
-;; Customize systemitem element to have different formatting, according
-;; to which class attribute it contains.
-(element systemitem
-  (let ((class (attribute-string (normalize "class"))))
-    (cond
-     ((equal? class (normalize "systemname")) ($italic-mono-seq$))
-     ((equal? class (normalize "constant")) ($mono-seq$))
-     (else ($charseq$)))))
-
-;; Okay, this is a little tricky.  By default, it appears that setinfo is
-;; completely turned off (with empty-sosofo).  The setinfo title is extracted
-;; through some other means, so we can ignore it when we process the setinfo
-;; below.
-
-;; Process setinfo element
-(element setinfo (process-children))
-;; Ignore title element -- otherwise it'll appear alongside the releaseinfo
-;; element.  If we add any other elements to setinfo, we'll have to blank them
-;; out here, also.
-(element (setinfo title)
-  (empty-sosofo))
-;; Enclose releaseinfo element in italics
-(element (setinfo releaseinfo)
-;  (make element gi: "i"
-;  (process-children)))
-  (process-children))
-
 </style-specification-body>
 </style-specification>