diff --git a/MAINTAINERS b/MAINTAINERS
index 04f61e4153..81d5fee75e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -267,7 +267,7 @@ F: app/test/test_pmd_ring.c
 
 Null PMD
 M: Tetsuya Mukawa <mukawa@igel.co.jp>
-F: lib/librte_pmd_null/
+F: drivers/net/null/
 
 
 Packet processing
diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst
index 0ac517ba6a..418e21cbba 100644
--- a/doc/guides/prog_guide/source_org.rst
+++ b/doc/guides/prog_guide/source_org.rst
@@ -108,6 +108,7 @@ The drivers directory has a net subdirectory which contains::
     +-- i40e               # 40GbE poll mode driver
     +-- ixgbe              # 10GbE poll mode driver
     +-- mlx4               # Mellanox ConnectX-3 poll mode driver
+    +-- null               # NULL poll mode driver for testing
 
 Applications
 ------------
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 45e06a6b59..5da94386aa 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -39,6 +39,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k
 DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e
 DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe
 DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += null
 
 include $(RTE_SDK)/mk/rte.sharelib.mk
 include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/lib/librte_pmd_null/Makefile b/drivers/net/null/Makefile
similarity index 100%
rename from lib/librte_pmd_null/Makefile
rename to drivers/net/null/Makefile
diff --git a/lib/librte_pmd_null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
similarity index 100%
rename from lib/librte_pmd_null/rte_eth_null.c
rename to drivers/net/null/rte_eth_null.c
diff --git a/lib/librte_pmd_null/rte_pmd_null_version.map b/drivers/net/null/rte_pmd_null_version.map
similarity index 100%
rename from lib/librte_pmd_null/rte_pmd_null_version.map
rename to drivers/net/null/rte_pmd_null_version.map
diff --git a/lib/Makefile b/lib/Makefile
index 80978cd8f0..d4533dcf67 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -47,7 +47,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += librte_pmd_virtio
 DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += librte_pmd_vmxnet3
 DIRS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += librte_pmd_xenvirt
 DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += librte_vhost
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += librte_pmd_null
 DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash
 DIRS-$(CONFIG_RTE_LIBRTE_LPM) += librte_lpm
 DIRS-$(CONFIG_RTE_LIBRTE_ACL) += librte_acl