diff --git a/doc/conf.py b/doc/conf.py
index 4228c29e2..f524c4538 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -30,7 +30,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Music Player Daemon'
-copyright = '2003-2017 The Music Player Daemon Project'
+copyright = '2003-2018 The Music Player Daemon Project'
 author = 'Max Kellermann'
 
 # The version info for the project you're documenting, acts as replacement for
diff --git a/doc/developer.rst b/doc/developer.rst
index 8f10c9435..316ed5eb1 100644
--- a/doc/developer.rst
+++ b/doc/developer.rst
@@ -54,7 +54,7 @@ If you already have a clone, update it:
 
     git pull --rebase git://github.com/MusicPlayerDaemon/MPD master
 
-You can do without "--rebase", but we recommend that you rebase your repository on the "master" repository all the time.
+You can do without :option:`--rebase`, but we recommend that you rebase your repository on the "master" repository all the time.
 
 Configure with the options :option:`--enable-debug --enable-werror`.  Enable as many plugins as possible, to be sure that you don't break any disabled code.
 
@@ -124,6 +124,6 @@ Now run the analyzer:
 
 .. code-block:: sh
 
-    scan-build --use-c++=clang++ --use-cc=clang make</programlisting>
+    scan-build --use-c++=clang++ --use-cc=clang make
 
 The options :option:`--use-c++` and :option:`--use-cc` are necessary because it invokes :command:`cc` for actually compiling the sources by default. That breaks, because MPD requires a C99 compiler.