diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 2b3c0c45571d12cff25e9bf195747c89a163a736..ee073ce39740cca513d75a41803e74eb891db160 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -141,5 +141,7 @@ source "drivers/staging/sep/Kconfig"
 
 source "drivers/staging/iio/Kconfig"
 
+source "drivers/staging/cowloop/Kconfig"
+
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index aa9553cc6a5824693d006685106f44e6657cac41..c5c8cae3645d078b416066dbd21bcee07091fc64 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -52,3 +52,4 @@ obj-$(CONFIG_VME_BUS)		+= vme/
 obj-$(CONFIG_RAR_REGISTER)	+= rar/
 obj-$(CONFIG_DX_SEP)		+= sep/
 obj-$(CONFIG_IIO)		+= iio/
+obj-$(CONFIG_COWLOOP)		+= cowloop/
diff --git a/drivers/staging/cowloop/Kconfig b/drivers/staging/cowloop/Kconfig
new file mode 100644
index 0000000000000000000000000000000000000000..58d2a23bd2c1392052fd889f84ae983e0bd38ff7
--- /dev/null
+++ b/drivers/staging/cowloop/Kconfig
@@ -0,0 +1,16 @@
+config COWLOOP
+	tristate "copy-on-write pseudo Block Driver"
+	depends on BLOCK
+	default n
+	---help---
+	  Cowloop is a "copy-on-write" pseudo block driver. It can be
+	  stacked on top of a "real" block driver, and catches all write
+	  operations on their way from the file systems layer above to
+	  the real driver below, effectively shielding the lower driver
+	  from those write accesses. The requests are then diverted to
+	  an ordinary file, located somewhere else (configurable). Later
+	  read requests are checked to see whether they can be serviced
+	  by the "real" block driver below, or must be pulled in from
+	  the diverted location. More information and userspace tools to
+	  use the driver are on the project's website
+	  http://www.ATComputing.nl/cowloop/
diff --git a/drivers/staging/cowloop/Makefile b/drivers/staging/cowloop/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..2b6b81a63d21d8cee1072c0a625a452310bf71aa
--- /dev/null
+++ b/drivers/staging/cowloop/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_COWLOOP)	+= cowloop.o