diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/applications b/profiles/templates/3.5/6_ac_update_sync/world/grp/applications
index 2adeb68c..a2758098 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/applications
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/applications
@@ -16,6 +16,7 @@ app-office/gnumeric
 app-office/libreoffice
 app-office/lyx
 app-office/orage
+app-office/QtBitcoinTrader
 app-office/scribus
 app-office/texmacs
 app-office/texmaker
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/builder-server b/profiles/templates/3.5/6_ac_update_sync/world/grp/builder-server
index bec21710..5ef55068 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/builder-server
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/builder-server
@@ -28,8 +28,6 @@ net-dialup/ppp
 net-libs/libpcap
 net-misc/minidlna
 net-misc/openssh
-net-p2p/mldonkey
-net-p2p/transmission
 net-print/cups
 net-print/cups-filters
 sys-apps/calculate-utils
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-util b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-util
index ed1c921c..10e22b12 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-util
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-util
@@ -25,6 +25,7 @@ dev-util/bbe
 dev-util/bcpp
 dev-util/bdelta
 dev-util/biew
+dev-util/bitcoin-tx
 dev-util/bless
 dev-util/bluej
 dev-util/boost-build
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/net-p2p b/profiles/templates/3.5/6_ac_update_sync/world/grp/net-p2p
new file mode 100644
index 00000000..950e089d
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/net-p2p
@@ -0,0 +1,21 @@
+# Calculate name=world format=world
+
+#?in(os_linux_pkglist, desktop, server)!=#
+net-p2p/mldonkey
+net-p2p/transmission
+#in#
+
+#?in(os_linux_pkglist, desktop)!=#
+net-p2p/amule
+net-p2p/bitcoin-cli
+net-p2p/bitcoind
+net-p2p/bitcoin-qt
+net-p2p/bitcoinxtd
+net-p2p/bitcoinxt-qt
+net-p2p/deluge
+net-p2p/kmldonkey
+net-p2p/ktorrent
+net-p2p/qbittorrent
+net-p2p/rtorrent
+net-p2p/vuze
+#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/netapps b/profiles/templates/3.5/6_ac_update_sync/world/grp/netapps
index 63d13783..c80bd532 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/netapps
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/netapps
@@ -2,7 +2,6 @@
 
 #?in(os_linux_pkglist, desktop, server)!=#
 net-analyzer/ettercap
-net-p2p/mldonkey
 #in#
 
 #?in(os_linux_pkglist, desktop)!=#
@@ -52,14 +51,6 @@ net-irc/quassel
 #net-irc/quassel-irssi
 net-irc/weechat
 net-misc/modem-manager-gui
-net-p2p/amule
-net-p2p/deluge
-net-p2p/kmldonkey
-net-p2p/ktorrent
-net-p2p/qbittorrent
-net-p2p/rtorrent
-net-p2p/transmission
-net-p2p/vuze
 net-voip/ekiga
 net-voip/linphone
 www-plugins/chrome-ublock
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/tools b/profiles/templates/3.5/6_ac_update_sync/world/grp/tools
index eb9b093f..484d4d8b 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/tools
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/tools
@@ -138,7 +138,6 @@ sys-fs/extundelete
 sys-apps/keyexec
 net-nds/shelldap
 net-news/quiterss
-#net-p2p/bitcoin-qt
 sys-auth/nss_ldap
 sys-auth/pam_ldap
 sys-auth/pam_update