diff --git a/doc/bookmarkfs.texi b/doc/bookmarkfs.texi
index afba78a..fc66041 100644
--- a/doc/bookmarkfs.texi
+++ b/doc/bookmarkfs.texi
@@ -95,7 +95,7 @@ Write to the
 for bug reports, feature requests, and other discussions.
 
 
-@node Porting
+@node Porting BookmarkFS
 @section Porting BookmarkFS
 
 Currently, BookmarkFS only runs on GNU/Linux and FreeBSD.
@@ -1036,7 +1036,6 @@ Read permission is denied for the directory.
 @end table
 
 @item BOOKMARKFS_IOC_FSCK_APPLY
-
 ``Repair'' a bookmark by renaming it.
 
 The @code{id} field must be set to a value previously obtained from
@@ -1109,10 +1108,15 @@ Typically, backends are built into shared libraries, and are installed as:
 @var{$@{pkglibdir@}}/backend-@var{$@{name@}}@var{$@{shlib_suffix@}}
 @end example
 
-Where @var{$@{name@}} is the backend name, equivalent to the value given to the
-@option{-o backend=@var{name}} option of frontend programs,
-and @var{$@{shlib_suffix@}} is the common filename extension for shared library
-files on the current platform (e.g. @file{.so} on GNU/Linux and FreeBSD).
+@table @var
+@item $@{name@}
+The backend name, equivalent to the value given to the
+@option{-o backend=@var{name}} option of frontend programs.
+
+@item $@{shlib_suffix@}
+The common filename extension for shared library files on the current platform
+(e.g. @file{.so} on GNU/Linux and FreeBSD).
+@end table
 
 
 @node Firefox
@@ -1414,7 +1418,7 @@ struct bookmarkfs_backend @{
     bookmarkfs_bookmark_rename_func  *bookmark_rename;
     bookmarkfs_bookmark_set_func     *bookmark_set;
 
-    bookmarkfs_object_free_func  *object_free;
+    bookmarkfs_object_free_func *object_free;
 @};
 @end example
 
@@ -1437,10 +1441,15 @@ shared libraries, and are installed as:
 @var{$@{pkglibdir@}}/fsck-handler-@var{$@{name@}}@var{$@{shlib_suffix@}}
 @end example
 
-Where @var{$@{name@}} is the handler name, equivalent to the value given to
-the @option{-o handler=@var{name}} option of @command{fsck.bookmarkfs},
-and @var{$@{shlib_suffix@}} is the common filename extension for shared library
-files on the current platform (e.g. @file{.so} on GNU/Linux and FreeBSD).
+@table @var
+@item $@{name@}
+The handler name, equivalent to the value given to the
+@option{-o handler=@var{name}} option of @command{fsck.bookmarkfs}.
+
+@item $@{shlib_suffix@}
+The common filename extension for shared library files on the current platform
+(e.g. @file{.so} on GNU/Linux and FreeBSD).
+@end table
 
 
 @node Built-in Filesystem-Check Handler