diff --git a/doc/Makefile b/doc/Makefile
index c84facb435b..2167980234f 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,12 +1,12 @@
-ENV = SGML_CATALOG_FILES=$(docbookcatalog)
-
-XMLLINT = $(ENV) xmllint --catalogs
-XSLTPROC = $(ENV) xsltproc --catalogs \
+XMLLINT = xmllint --catalogs
+XSLTPROC = xsltproc --catalogs \
  --param section.autolabel 1 \
  --param section.label.includes.component.label 1 \
  --param html.stylesheet \'style.css\' \
  --param xref.with.number.and.title 1 \
- --param toc.section.depth 3
+ --param toc.section.depth 3 \
+ --param admon.style \'\' \
+ --param callout.graphics.extension \'.gif\'
 
 NEWS_OPTS = \
  --stringparam generate.toc "article nop" \
diff --git a/doc/quote-literals.xsl b/doc/quote-literals.xsl
index 983f5ac3506..03971bff90d 100644
--- a/doc/quote-literals.xsl
+++ b/doc/quote-literals.xsl
@@ -37,4 +37,8 @@
     </xsl:element>
   </xsl:template>
 
+  <xsl:template match="text()">
+    <xsl:value-of select="translate(., '‘’“”—', concat(&quot;`'&quot;, '&quot;&quot;-'))" />
+  </xsl:template>
+  
 </xsl:stylesheet>
diff --git a/doc/release-notes.xml b/doc/release-notes.xml
index ec605661ce7..7a6eca7e112 100644
--- a/doc/release-notes.xml
+++ b/doc/release-notes.xml
@@ -1,11 +1,47 @@
-<?xml version="1.0"?>
-<!DOCTYPE book
-    PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-    "http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip"
-[
-]>
+<?xml version="1.0" encoding="UTF-8"?>
+<article xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink">
 
-<article><title>Nixpkgs Release Notes</title>
+<title>Nixpkgs Release Notes</title>
+
+
+<section><title>Release 0.10 (October ???, 2006)</title>
+
+<note><para>This release of Nixpkgs requires <link
+xlink:href='http://nix.cs.uu.nl/dist/nix/nix-0.10/'>Nix
+0.10</link>.</para></note>
+
+<para>This release has the following improvements:</para>
+
+<itemizedlist>
+
+  <listitem><para>TODO: user configurability.  Configuration file in
+  <filename>~/.nixpkgs/config.nix</filename>.</para></listitem>
+
+  <listitem><para>The default compiler is now GCC 4.1.1.</para></listitem>
+
+  <listitem><para>X11 updated to X11R7.1.</para></listitem>
+
+  <listitem><para>Opera.</para></listitem>
+
+</itemizedlist>
+
+<para>The following people contributed to this release:
+
+  Andres Löh,
+  Armijn Hemel,
+  Christof Douma,
+  Eelco Dolstra,
+  Eelco Visser,
+  Mart Kolthof,
+  Martin Bravenboer,
+  Merijn de Jonge,
+  Rob Vermaas and
+  Roy van den Broek.
+
+</para>
+  
+</section>
 
 
 <section><title>Release 0.9 (January 31, 2006)</title>
@@ -16,8 +52,8 @@ some of the more notable changes:</para>
 
 <itemizedlist>
 
-  <listitem><para>Distribution files have been moved to <ulink
-  url="http://nix.cs.uu.nl/" />.</para></listitem>
+  <listitem><para>Distribution files have been moved to <link
+  xlink:href="http://nix.cs.uu.nl/" />.</para></listitem>
 
   <listitem><para>The C library on Linux, Glibc, has been updated to
   version 2.3.6.</para></listitem>
@@ -32,7 +68,7 @@ some of the more notable changes:</para>
   working X server (previously we only had X client libraries).  We
   use a fully Nixified X server on NixOS.</para></listitem>
 
-  <listitem><para>The Sun JDK 5 has been purified, i.e., it doesn't
+  <listitem><para>The Sun JDK 5 has been purified, i.e., it doesn’t
   require any non-Nix components such as
   <filename>/lib/ld-linux.so.2</filename>.  This means that Java
   applications such as Eclipse and Azureus can run on
@@ -149,9 +185,10 @@ hashing scheme in Nix 0.8.</para>
 <listitem>
 
   <para>Tarballs used by Nixpkgs are now obtained from the same server
-  that hosts Nixpkgs (<ulink url="http://catamaran.labs.cs.uu.nl/" />).
-  This reduces the risk of packages being unbuildable due to moved or
-  deleted files on various servers.</para>
+  that hosts Nixpkgs (<link
+  xlink:href="http://catamaran.labs.cs.uu.nl/" />).  This reduces the
+  risk of packages being unbuildable due to moved or deleted files on
+  various servers.</para>
 
 </listitem>
 
diff --git a/doc/style.css b/doc/style.css
index bf6fc3ecf43..e992a9a85dd 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -10,7 +10,6 @@ body
 {
     font-family: sans-serif;
     background: white;
-  
     margin: 2em 1em 2em 1em;
 }
 
@@ -34,16 +33,28 @@ h2 /* chapters, appendices, subtitle */
 div.chapter > div.titlepage h2, div.appendix > div.titlepage h2 
 { 
     margin-top: 1.5em;
-/*    border-top: solid #005aa0; */
 }
 
-div.sect1 h2 /* sections */
+div.section > div.titlepage h2 /* sections */
 {
     font-size: 150%;
+    margin-top: 1.5em;
+}
+
+h3 /* subsections */
+{
+    font-size: 125%;
+}
+
+div.appendix h3
+{
+    font-size: 150%;
+    margin-top: 1.5em;
 }
 
 div.refnamediv h2, div.refsynopsisdiv h2, div.refsection h2 /* refentry parts */
 {
+    margin-top: 1.4em;
     font-size: 125%;
 }
 
@@ -52,30 +63,23 @@ div.refsection h3
     font-size: 110%;
 }
 
-h3 /* subsections */
-{
-    font-size: 125%;
-}
-
-
 
 /***************************************************************************
-                               Program listings:
+                               Examples:
  ***************************************************************************/
 
 div.example
 {
     border: 1px solid #6185a0;
     padding: 6px 6px;
-    margin-left: 3em;
-    margin-right: 3em;
-    background: #eeeeee;
+    margin-left: 1.5em;
+    margin-right: 1.5em;
+    background: #f4f4f8;
 }
 
-pre.programlisting
+div.example p.title
 {
-    color: #600000;
-    font-family: monospace;
+    margin-top: 0em;
 }
 
 
@@ -83,41 +87,63 @@ pre.programlisting
                             Screen dumps:
  ***************************************************************************/
 
-pre.screen
+pre.screen, pre.programlisting
 {
     border: 1px solid #6185a0;
-    padding: 6px 6px;
-    margin-left: 3em;
-    margin-right: 3em;
+    padding: 3px 3px;
+    margin-left: 1.5em;
+    margin-right: 1.5em;
     color: #600000;
-    background: #eeeeee;
+    background: #f4f4f8;
     font-family: monospace;
     /* font-size: 90%; */
 }
 
+div.example pre.programlisting
+{
+    border: 0px;
+    padding: 0 0;
+    margin: 0 0 0 0;
+}
+
 
 /***************************************************************************
                                Notes, warnings etc:
  ***************************************************************************/
 
-.note,.warning
+.note, .warning
 {
-    margin-top: 1em;
-    margin-bottom: 1em;
     border: 1px solid #6185a0;
-    padding: 0px 1em;
+    padding: 3px 3px;
+    margin-left: 1.5em;
+    margin-right: 1.5em;
+    margin-bottom: 1em;
+    padding: 0.3em 0.3em 0.3em 0.3em;
     background: #fffff5;
 }
 
-div.note,div.warning
+div.note, div.warning
 {
     font-style: italic;
 }
 
-div.warning h3
+div.note h3, div.warning h3
 {
     color: red;
     font-size: 100%;
+//    margin: 0 0 0 0;
+    padding-right: 0.5em;
+    display: inline;
+}
+
+div.note p, div.warning p
+{
+    margin-bottom: 0em;
+}
+
+div.note h3 + p, div.warning h3 + p
+{
+    display: inline;
 }
 
 div.note h3
@@ -167,9 +193,19 @@ tt, code
     
 }
 
-div.variablelist dd
+div.variablelist dd p, div.glosslist dd p
 {
-    margin-bottom: 1em;
+    margin-top: 0em;
+}
+
+div.variablelist dd, div.glosslist dd
+{
+    margin-left: 1.5em;
+}
+
+div.glosslist dt
+{
+    font-style: italic;
 }
 
 .default
@@ -232,3 +268,16 @@ table.productionset table.productionset
 {
     font-family: monospace;
 }
+
+strong.command
+{
+//    font-family: monospace;
+//    font-style: italic;
+//    font-weight: normal;
+    color: #400000;
+}
+
+div.calloutlist td
+{
+    padding-bottom: 1em;
+}