diff --git a/share/man/man9/driver.9 b/share/man/man9/driver.9
index 960c9ae9535c..93ab992ce741 100644
--- a/share/man/man9/driver.9
+++ b/share/man/man9/driver.9
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 3, 2010
+.Dd November 22, 2011
 .Dt DRIVER 9
 .Os
 .Sh NAME
@@ -58,7 +58,7 @@ static device_method_t foo_methods[] = {
 	DEVMETHOD(bogo_twiddle,		foo_twiddle),
 
 	/* Terminate method list */
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
 static driver_t foo_driver = {
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index 25dcbcefe7b0..663684313435 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -571,9 +571,10 @@ extern int bus_current_pass;
 void	bus_set_pass(int pass);
 
 /**
- * Shorthand for constructing method tables.
+ * Shorthands for constructing method tables.
  */
 #define	DEVMETHOD	KOBJMETHOD
+#define	DEVMETHOD_END	KOBJMETHOD_END
 
 /*
  * Some common device interfaces.