diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index cdfc905967dc91277d42e4f2463615c9a9291fb4..0cb7d819a5d21366a04cab30b4a6c291ffc90c42 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -16,7 +16,7 @@ config CYPRESS_FIRMWARE
 	tristate "Cypress firmware helper routines"
 	depends on USB
 
-source "drivers/media/common/videobuf/Kconfig"
+source "drivers/media/common/videobuf2/Kconfig"
 source "drivers/media/common/b2c2/Kconfig"
 source "drivers/media/common/saa7146/Kconfig"
 source "drivers/media/common/siano/Kconfig"
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index f24b5ed39982022fdbeef4cb5e208e29476a3d4b..e7bc17abbbbcef18d15a7956918259aa6adc6418 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,4 +1,4 @@
-obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/ videobuf/
+obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/ videobuf2/
 obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
 obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
 obj-$(CONFIG_CYPRESS_FIRMWARE) += cypress_firmware.o
diff --git a/drivers/media/common/videobuf/Kconfig b/drivers/media/common/videobuf2/Kconfig
similarity index 100%
rename from drivers/media/common/videobuf/Kconfig
rename to drivers/media/common/videobuf2/Kconfig
diff --git a/drivers/media/common/videobuf/Makefile b/drivers/media/common/videobuf2/Makefile
similarity index 100%
rename from drivers/media/common/videobuf/Makefile
rename to drivers/media/common/videobuf2/Makefile
diff --git a/drivers/media/common/videobuf/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
similarity index 100%
rename from drivers/media/common/videobuf/videobuf2-core.c
rename to drivers/media/common/videobuf2/videobuf2-core.c
diff --git a/drivers/media/common/videobuf/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
similarity index 100%
rename from drivers/media/common/videobuf/videobuf2-dma-contig.c
rename to drivers/media/common/videobuf2/videobuf2-dma-contig.c
diff --git a/drivers/media/common/videobuf/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
similarity index 100%
rename from drivers/media/common/videobuf/videobuf2-dma-sg.c
rename to drivers/media/common/videobuf2/videobuf2-dma-sg.c
diff --git a/drivers/media/common/videobuf/videobuf2-dvb.c b/drivers/media/common/videobuf2/videobuf2-dvb.c
similarity index 100%
rename from drivers/media/common/videobuf/videobuf2-dvb.c
rename to drivers/media/common/videobuf2/videobuf2-dvb.c
diff --git a/drivers/media/common/videobuf/videobuf2-memops.c b/drivers/media/common/videobuf2/videobuf2-memops.c
similarity index 100%
rename from drivers/media/common/videobuf/videobuf2-memops.c
rename to drivers/media/common/videobuf2/videobuf2-memops.c
diff --git a/drivers/media/common/videobuf/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
similarity index 100%
rename from drivers/media/common/videobuf/videobuf2-v4l2.c
rename to drivers/media/common/videobuf2/videobuf2-v4l2.c
diff --git a/drivers/media/common/videobuf/videobuf2-vmalloc.c b/drivers/media/common/videobuf2/videobuf2-vmalloc.c
similarity index 100%
rename from drivers/media/common/videobuf/videobuf2-vmalloc.c
rename to drivers/media/common/videobuf2/videobuf2-vmalloc.c