diff --git a/Makefile b/Makefile
index 7846086294..0fa39d7a41 100644
--- a/Makefile
+++ b/Makefile
@@ -344,6 +344,7 @@ install: install-config install-dbus-policy all
 		$(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
 	fi
 	$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
+	$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
 	- rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
 	- ln -f -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
@@ -359,6 +360,7 @@ uninstall: uninstall-dbus-policy
 	- rm $(configdir)/udev.conf
 	- rm $(initdir)/udev
 	- rm $(mandir)/man8/udev.8
+	- rm $(mandir)/man8/udevinfo.8
 	- rm $(sbindir)/$(ROOT)
 	- rm $(sbindir)/$(HELPER)
 	- rmdir $(hotplugdir)
diff --git a/udevinfo.8 b/udevinfo.8
new file mode 100644
index 0000000000..852e2ae93f
--- /dev/null
+++ b/udevinfo.8
@@ -0,0 +1,52 @@
+.TH UDEVINFO 8 "October 2003" "" "Linux Administrator's Manual"
+.SH NAME
+udevinfo \- retrieve information from udev
+.SH SYNOPSIS
+.B udevinfo
+.RI "[-q " query_type " -p " sysfs_path "] [-drVh]"
+.SH "DESCRIPTION"
+.B udevinfo
+allows users to query the udev database for information on any of the devices
+currently present in the system.  It also provides a way to query any device
+in the sysfs tree to help in creating
+.B udev
+rule files.
+.SH "OPTIONS"
+.TP
+.B -V
+Print the version information.
+.TP
+.B -r
+Print the the
+.B udev_root
+directory. When used in conjunction with a query for the node name, the
+.B udev_root
+will be prepended.
+.TP
+.BI -q " query_type"
+Query the database for specified value of a created device node.
+Valid types are:
+.BR name ", " symlink ", " owner " , " group " or " path.
+.TP
+.BI -p " sysfs_path"
+Specify the sysfs path of the device to query.
+.TP
+.BI -n " name"
+Specify the name of the node for the device to query.
+.TP
+.B -d
+Dump the whole database.
+.TP
+.B -h
+Print help text.
+.SH "FILES"
+.nf
+/etc/udev/*  udev config files
+.fi
+.LP
+.SH "SEE ALSO"
+.BR udev (8)
+.SH AUTHORS
+.B udevinfo
+was developed primarily by Kay Sievers <kay.sievers@vrfy.org>, with help
+from others.