diff --git a/udev.8 b/udev.8
index eb772c9dbe..5f497af92a 100644
--- a/udev.8
+++ b/udev.8
@@ -3,6 +3,9 @@
 udev \- Linux configurable dynamic device naming support
 .SH SYNOPSIS
 .BI udev " hotplug-subsystem"
+.br
+.B udev
+.RI "[-q " sysfs_path "] [-rVh]"
 .SH "DESCRIPTION"
 .B udev
 creates or removes device node files usually located in the /dev directory.
@@ -26,6 +29,27 @@ maintains a database for devices present on the system.
 On device removal,
 .B udev
 queries the internal database for the name of the device file to be deleted.
+.SH "OPTIONS"
+.B udev
+normally is called by
+.B hotplug
+with the subsystem as argument and various environment variables set.
+.br
+It may also called with the following options:
+.TP
+.B -V
+Print the version information.
+.TP
+.B -r
+Print the the
+.B udev
+root directory.
+.TP
+.BI -q " sysfs_path"
+Query with the sysfs path as argument for the name of the created device node.
+.TP
+.B -h
+Print help text.
 .SH "CONFIGURATION"
 All
 .B udev
diff --git a/udev.c b/udev.c
index 1797e08273..0d0a5da207 100644
--- a/udev.c
+++ b/udev.c
@@ -130,7 +130,7 @@ static inline int udev_user(int argc, char **argv)
 
 help:
 	printf("Usage: [-qrVh]\n"
-	       "  -q arg     query database \n"
+	       "  -q <path>  query database for the name of the created node\n"
 	       "  -r         print udev root\n"
 	       "  -V         print udev version\n"
 	       "  -h         print this help text\n"
diff --git a/udevdb.c b/udevdb.c
index 0f9de661a4..ca9e63c97e 100644
--- a/udevdb.c
+++ b/udevdb.c
@@ -130,7 +130,7 @@ int udevdb_init(int init_flag)
 }
 
 /**
- * udevdb_init: open database for reading
+ * udevdb_open_ro: open database for reading
  */
 int udevdb_open_ro(void)
 {