diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 0fb3af94ee..194913d170 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -415,24 +415,24 @@ PKG_DICTIONARIES:= \
 	microsoft \
 	wispr \
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-ldap),)
-  CONFIGURE_ARGS+= \
-		--with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \
-		--with-rlm_ldap-lib-dir="$(STAGING_DIR)/usr/lib"
-  CONFIGURE_LIBS+= -lcrypto -lssl
-else
+#ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-ldap),)
+#  CONFIGURE_ARGS+= \
+#		--with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \
+#		--with-rlm_ldap-lib-dir="$(STAGING_DIR)/usr/lib"
+#  CONFIGURE_LIBS+= -lcrypto -lssl
+#else
   CONFIGURE_ARGS+= --without-rlm_ldap
-endif
+#endif
 
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-mysql),)
-  CONFIGURE_ARGS+= \
-		--with-mysql-include-dir="$(STAGING_DIR)/usr/include" \
-		--with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql"
-  CONFIGURE_LIBS+= -lz
-  CONFIGURE_VARS+= ac_cv_lib_mysqlclient_r_mysql_init=yes
-else
+#ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-mysql),)
+#  CONFIGURE_ARGS+= \
+#		--with-mysql-include-dir="$(STAGING_DIR)/usr/include" \
+#		--with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql"
+#  CONFIGURE_LIBS+= -lz
+#  CONFIGURE_VARS+= ac_cv_lib_mysqlclient_r_mysql_init=yes
+#else
   CONFIGURE_ARGS+= --without-rlm_sql_mysql
-endif
+#endif
 
 ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-pgsql),)
   CONFIGURE_ARGS+= \
@@ -612,13 +612,13 @@ $(eval $(call BuildPlugin,freeradius2-mod-exec,rlm_exec,modules/exec modules/ech
 $(eval $(call BuildPlugin,freeradius2-mod-attr-rewrite,rlm_attr_rewrite,modules/attr_rewrite,modules,))
 $(eval $(call BuildPlugin,freeradius2-mod-files,rlm_files,acct_users preproxy_users users modules/files,modules,))
 $(eval $(call BuildPlugin,freeradius2-mod-passwd,rlm_passwd,modules/passwd,modules,))
-$(eval $(call BuildPlugin,freeradius2-mod-ldap,rlm_ldap,ldap.attrmap modules/ldap,modules,))
+#$(eval $(call BuildPlugin,freeradius2-mod-ldap,rlm_ldap,ldap.attrmap modules/ldap,modules,))
 $(eval $(call BuildPlugin,freeradius2-mod-mschap,rlm_mschap,modules/mschap,modules,))
 $(eval $(call BuildPlugin,freeradius2-mod-pap,rlm_pap,modules/pap,modules,))
 $(eval $(call BuildPlugin,freeradius2-mod-preprocess,rlm_preprocess,hints huntgroups modules/preprocess,modules,))
 $(eval $(call BuildPlugin,freeradius2-mod-realm,rlm_realm,proxy.conf modules/realm modules/inner-eap,modules,))
 $(eval $(call BuildPlugin,freeradius2-mod-sql,rlm_sql,sql.conf,))
-$(eval $(call BuildPlugin,freeradius2-mod-sql-mysql,rlm_sql_mysql,))
+#$(eval $(call BuildPlugin,freeradius2-mod-sql-mysql,rlm_sql_mysql,))
 $(eval $(call BuildPlugin,freeradius2-mod-sql-pgsql,rlm_sql_postgresql,))
 $(eval $(call BuildPlugin,freeradius2-mod-sql-sqlite,rlm_sql_sqlite,))
 $(eval $(call BuildPlugin,freeradius2-mod-sqlcounter,rlm_sqlcounter,))
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index ad4c447fae..933b869b9b 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -90,4 +90,4 @@ endef
 Package/rtorrent-rpc/install = $(Package/rtorrent/install)
 
 $(eval $(call BuildPackage,rtorrent))
-$(eval $(call BuildPackage,rtorrent-rpc))
+#$(eval $(call BuildPackage,rtorrent-rpc))
diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index 200b91f9c2..a7b4315cfc 100644
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -28,6 +28,7 @@ COLLECTD_PLUGINS_DISABLED:= \
 	battery \
 	cpufreq \
 	curl_json \
+	dbi \
 	entropy \
 	genericjmx \
 	gmond \
@@ -45,6 +46,7 @@ COLLECTD_PLUGINS_DISABLED:= \
 	nfs \
 	notify_desktop \
 	notify_email \
+	nut \
 	openvz \
 	oracle \
 	perl \
@@ -71,7 +73,6 @@ COLLECTD_PLUGINS_SELECTED:= \
 	cpu \
 	csv \
 	curl \
-	dbi \
 	df \
 	disk \
 	dns \
@@ -93,7 +94,6 @@ COLLECTD_PLUGINS_SELECTED:= \
 	network \
 	nginx \
 	ntpd \
-	nut \
 	olsrd \
 	onewire \
 	openvpn \
@@ -263,7 +263,7 @@ $(eval $(call BuildPlugin,contextswitch,context switch input,contextswitch,))
 $(eval $(call BuildPlugin,cpu,CPU input,cpu,))
 $(eval $(call BuildPlugin,csv,CSV output,csv,))
 $(eval $(call BuildPlugin,curl,cURL input,curl,+PACKAGE_collectd-mod-curl:libcurl))
-$(eval $(call BuildPlugin,dbi,relational database input,dbi,+PACKAGE_collectd-mod-dbi:libdbi))
+#$(eval $(call BuildPlugin,dbi,relational database input,dbi,+PACKAGE_collectd-mod-dbi:libdbi))
 $(eval $(call BuildPlugin,df,disk space input,df,))
 $(eval $(call BuildPlugin,disk,disk usage/timing input,disk,))
 $(eval $(call BuildPlugin,dns,DNS traffic input,dns,+PACKAGE_collectd-mod-dns:libpcap))
@@ -278,14 +278,14 @@ $(eval $(call BuildPlugin,iwinfo,libiwinfo wireless statistics,iwinfo,+PACKAGE_c
 $(eval $(call BuildPlugin,load,system load input,load,))
 $(eval $(call BuildPlugin,logfile,log files output,logfile,))
 $(eval $(call BuildPlugin,madwifi,MadWifi status input,madwifi,))
-$(eval $(call BuildPlugin,mysql,MySQL status input,mysql,+PACKAGE_collectd-mod-mysql:libmysqlclient-r))
+#$(eval $(call BuildPlugin,mysql,MySQL status input,mysql,+PACKAGE_collectd-mod-mysql:libmysqlclient-r))
 $(eval $(call BuildPlugin,memory,physical memory usage input,memory,))
 $(eval $(call BuildPlugin,modbus,read variables through libmodbus,modbus,+PACKAGE_collectd-mod-modbus:libmodbus @BROKEN))
 $(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:ip @BROKEN))
 $(eval $(call BuildPlugin,network,network input/output,network))
 $(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-nginx:libcurl))
 $(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,))
-$(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut))
+#$(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut))
 $(eval $(call BuildPlugin,olsrd,OLSRd status input,olsrd,))
 $(eval $(call BuildPlugin,onewire,onewire sensor input,onewire,+PACKAGE_collectd-mod-onewire:libow-capi @BROKEN))
 $(eval $(call BuildPlugin,openvpn,OpenVPN traffic/compression input,openvpn,))