4 files changed, 19 insertions, 4 deletions

diff --git a/Config.in.legacy b/Config.in.legacy
index be4c9532de..67a9a23dd4 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,20 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2017.05"
 
+config BR2_NBD_CLIENT
+	bool "nbd client option was renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_NBD_CLIENT
+	help
+	  The nbd client option has been renamed to BR2_PACKAGE_NBD_CLIENT.
+
+config BR2_NBD_SERVER
+	bool "nbd server option was renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_NBD_SERVER
+	help
+	  The nbd server option has been renamed to BR2_PACKAGE_NBD_SERVER.
+
 config BR2_PACKAGE_GMOCK
 	bool "gmock merged into gtest package"
 	select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 8daf6705fa..268c2fb654 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1652,6 +1652,7 @@ F:	package/libseccomp/
 F:	package/linux-tools/
 F:	package/mesa3d-headers/
 F:	package/mke2img/
+F:	package/nbd/
 F:	package/nut/
 F:	package/nvidia-driver/
 F:	package/omxplayer/
diff --git a/package/nbd/Config.in b/package/nbd/Config.in
index a5ded2984b..b00bc40a8e 100644
--- a/package/nbd/Config.in
+++ b/package/nbd/Config.in
@@ -12,13 +12,13 @@ config BR2_PACKAGE_NBD
 
 if BR2_PACKAGE_NBD
 
-config BR2_NBD_CLIENT
+config BR2_PACKAGE_NBD_CLIENT
 	bool "nbd client"
 	default y
 	help
 	  the client part of NBD.
 
-config BR2_NBD_SERVER
+config BR2_PACKAGE_NBD_SERVER
 	bool "nbd server"
 	help
 	  the server part of NBD.
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index d91c2d717e..c7c327eb38 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -18,10 +18,10 @@ ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 NBD_CONF_ENV = ac_cv_header_linux_falloc_h=no
 endif
 
-ifneq ($(BR2_NBD_CLIENT),y)
+ifneq ($(BR2_PACKAGE_NBD_CLIENT),y)
 NBD_TOREMOVE += nbd-client
 endif
-ifneq ($(BR2_NBD_SERVER),y)
+ifneq ($(BR2_PACKAGE_NBD_SERVER),y)
 NBD_TOREMOVE += nbd-server
 endif