diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 7f6ca5d41..a4d550a33 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
 Version 1.02.68 -
 ==================================
+  Add dmsetup wipe_table to replace table with one that uses error target.
   Add 'blkdevname' and 'blkdevs_used' field to dmsetup info -c -o.
   Add 'blkdevname' option to dmsetup ls --tree to see block device names.
   Add '-o options' to dmsetup deps and ls to select device name type on output.
diff --git a/man/dmsetup.8.in b/man/dmsetup.8.in
index 7b8d97e28..7b6e33130 100644
--- a/man/dmsetup.8.in
+++ b/man/dmsetup.8.in
@@ -69,6 +69,9 @@ dmsetup \- low level logical volume management
 .RB [ \-\-table
 .RI < table >| table_file ]
 .br
+.B dmsetup wipe_table
+.I device_name
+.br
 .B dmsetup remove
 .RB [ \-f | \-\-force ]
 .RB [ \-\-retry ]
@@ -355,6 +358,15 @@ Loads <table> or table_file into the inactive table slot for device_name.
 If neither is supplied, reads a table from standard input.
 .br
 .HP
+.B wipe_table
+.I device_name
+.br
+Wait for any I/O in-flight through the device to complete, then
+replace the table with a new table that fails any new I/O
+sent to the device.  If successful, this should release any devices 
+held open by the device's table(s).
+.br
+.HP
 .B message
 .I device_name sector message
 .br
diff --git a/tools/dmsetup.c b/tools/dmsetup.c
index dbdf481b0..195dcce13 100644
--- a/tools/dmsetup.c
+++ b/tools/dmsetup.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved.
  * Copyright (C) 2005-2007 NEC Corporation
  *
  * This file is part of the device-mapper userspace tools.
@@ -2870,6 +2870,7 @@ static struct command _commands[] = {
 	{"load", "<device> [<table_file>]", 0, 2, 0, _load},
 	{"clear", "<device>", 0, -1, 1, _clear},
 	{"reload", "<device> [<table_file>]", 0, 2, 0, _load},
+	{"wipe_table", "<device>", 0, -1, 1, _error_device},
 	{"rename", "<device> [--setuuid] <new_name_or_uuid>", 1, 2, 0, _rename},
 	{"message", "<device> <sector> <message>", 2, -1, 0, _message},
 	{"ls", "[--target <target_type>] [--exec <command>] [-o options] [--tree]", 0, 0, 0, _ls},