endchoice
 
 config BR2_PACKAGE_PMACCT_CLIENT
-       prompt "pmacct-client - Command-line client to gather data from the IMT plugin" if BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_NFACCTD_MYSQL || BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_NFACCTD_CUSTOM || BR2_PACKAGE_PMACCTD_BASIC || BR2_PACKAGE_PMACCTD_MYSQL || BR2_PACKAGE_PMACCTD_PGSQL || BR2_PACKAGE_PMACCTD_CUSTOM
+       prompt "pmacct-client - Command-line client to gather data from the IMT plugin"
        tristate
        default m if CONFIG_DEVEL
        depends BR2_PACKAGE_PMACCT
 
 config BR2_PACKAGE_PMACCT_BASIC
        tristate
-       default BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_PMACCTD_BASIC
+       default BR2_PACKAGE_NFACCTD_BASIC || BR2_PACKAGE_PMACCTD_BASIC || BR2_PACKAGE_PMACCT_CLIENT
 
 config BR2_PACKAGE_PMACCT_MYSQL
        tristate
        tristate
        default BR2_PACKAGE_NFACCTD_PGSQL || BR2_PACKAGE_PMACCTD_PGSQL
 
-config BR2_PACKAGE_PMACCT_DEVEL
-       tristate
-       default m if CONFIG_DEVEL
-       select BR2_PACKAGE_NFACCTD_BASIC if CONFIG_DEVEL
-       select BR2_PACKAGE_PMACCTD_BASIC if CONFIG_DEVEL