diff --git a/app-admin/conky/conky-1.4.2.ebuild b/app-admin/conky/conky-1.4.2.ebuild
index 6df48d1c..21e68fa6 100644
--- a/app-admin/conky/conky-1.4.2.ebuild
+++ b/app-admin/conky/conky-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="truetype X ipv6 bmpx bmp xmms infopipe audacious"
+IUSE="truetype X ipv6 bmpx bmp xmms xmms2 infopipe audacious"
 
 DEPEND_COMMON="
 	virtual/libc
@@ -33,6 +33,7 @@ DEPEND_COMMON="
 		audacious? ( media-sound/audacious )
 		infopipe? ( media-plugins/xmms-infopipe )
 		xmms? ( media-sound/xmms )
+		xmms2? ( medis-sound/xmms2 )
 	)"
 
 RDEPEND="${DEPEND_COMMON}"
@@ -72,6 +73,7 @@ src_compile() {
 		$(use_enable bmpx) \
 		$(use_enable bmp) \
 		$(use_enable xmms) \
+		$(use_enable xmms2) \
 		$(use_enable audacious) \
 		$(use_enable infopipe) \
 		$(use_enable !ipv6 portmon) || die "econf failed"
diff --git a/src/conky.c b/src/conky.c
index 39eb7733..6d1534ce 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -3248,13 +3248,13 @@ static void generate_text_internal(char *p, int p_max_size, struct text_object *
 				OBJ(diskio) {
 					if (!use_spacer) {
 						if (diskio_value > 1024*1024) {
-							snprintf(p, p_max_size, "%.1fG",
+							snprintf(p, p_max_size, "%.1fGiB",
 									(double)diskio_value/1024/1024);
 						} else if (diskio_value > 1024) {
-							snprintf(p, p_max_size, "%.1fM",
+							snprintf(p, p_max_size, "%.1fMiB",
 									(double)diskio_value/1024);
 						} else if (diskio_value > 0) {
-							snprintf(p, p_max_size, "%dK", diskio_value);
+							snprintf(p, p_max_size, "%dKiB", diskio_value);
 						} else {
 							snprintf(p, p_max_size, "%d", diskio_value);
 						}