diff --git a/app-admin/conky/conky-1.4.0.ebuild b/app-admin/conky/conky-1.4.0.ebuild
index f68d5b86..2fd34f78 100644
--- a/app-admin/conky/conky-1.4.0.ebuild
+++ b/app-admin/conky/conky-1.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~alpha"
 IUSE="truetype X ipv6 bmpx bmp xmms infopipe audacious"
 
 DEPEND_COMMON="
diff --git a/app-admin/conky/conky-1.9999.ebuild b/app-admin/conky/conky-1.9999.ebuild
index 259ad6e7..1d3f5191 100644
--- a/app-admin/conky/conky-1.9999.ebuild
+++ b/app-admin/conky/conky-1.9999.ebuild
@@ -10,63 +10,102 @@ HOMEPAGE="http://conky.sf.net"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="truetype seti X"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~alpha"
+IUSE="truetype X ipv6 bmpx bmp xmms infopipe audacious"
 
-RDEPEND="virtual/libc
-   X? ( virtual/x11 )
-   truetype? ( >=media-libs/freetype-2 )
-   seti? ( sci-astronomy/setiathome )
-   "
+DEPEND_COMMON="
+	virtual/libc
+	X? (
+		|| ( ( x11-libs/libICE
+				x11-libs/libXext
+				x11-libs/libX11
+				x11-libs/libSM
+				x11-libs/libXrender
+				x11-libs/libXft
+				)
+				virtual/x11
+		)
+		truetype? ( >=media-libs/freetype-2 )
+		bmpx? ( media-sound/bmpx
+				>=sys-apps/dbus-0.35
+			)
+		bmp? ( media-sound/beep-media-player )
+		audacious? ( media-sound/audacious )
+		infopipe? ( || ( media-plugins/xmms-infopipe media-plugins/bmp-infopipe ) )
+		xmms? ( media-sound/xmms )
+	)"
 
-DEPEND="truetype? ( >=media-libs/freetype-2 )
-   X? ( virtual/x11 )
-   >=sys-devel/automake-1.9
-   >=sys-devel/autoconf-2.59
-   sys-devel/libtool
-   sys-apps/grep
-   sys-apps/sed
-   sys-devel/gcc
-   "
+RDEPEND="${DEPEND_COMMON}"
+
+DEPEND="
+	${DEPEND_COMMON}
+	X? (
+		|| ( ( x11-libs/libXt
+				x11-proto/xextproto
+				x11-proto/xproto
+				)
+				virtual/x11
+		)
+	)
+	sys-apps/grep
+	sys-apps/sed"
 
 S=${WORKDIR}/conky
 
 src_unpack() {
         cvs_src_unpack
         cd ${S}
-        NOCONFIGURE=blah ./autogen.sh
+        ./autogen.sh
 }
 
 src_compile() {
-    local myconf
-    myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime --enable-mpd --enable-mldonkey"
-    econf \
-        ${myconf} \
-        $(use_enable truetype xft) \
-        $(use_enable X x11) \
-        $(use_enable !ipv6 portmon) \
-        $(use_enable seti) || die "econf failed"
-    emake || die "compile failed"
+	local mymake
+	if useq ipv6 ; then
+		ewarn
+		ewarn "You have the ipv6 USE flag enabled.  Please note that"
+		ewarn "using the ipv6 USE flag with Conky disables the port"
+		ewarn "monitor."
+		ewarn
+		epause
+	else
+		mymake="MPD_NO_IPV6=noipv6"
+	fi
+	local myconf
+	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime \
+		--enable-mpd --enable-mldonkey"
+	econf \
+		${myconf} \
+		$(use_enable truetype xft) \
+		$(use_enable X x11) \
+		$(use_enable bmpx) \
+		$(use_enable bmp) \
+		$(use_enable xmms) \
+		$(use_enable audacious) \
+		$(use_enable infopipe) \
+		$(use_enable !ipv6 portmon) || die "econf failed"
+	emake ${mymake} || die "compile failed"
 }
 
 src_install() {
-   emake DESTDIR=${D} install || die "make install failed"
-   dodoc ChangeLog AUTHORS README doc/conkyrc.sample
+	emake DESTDIR=${D} install || die "make install failed"
+	dodoc ChangeLog AUTHORS README doc/conkyrc.sample doc/variables.html
+	dodoc doc/docs.html doc/config_settings.html
 }
 
 pkg_postinst() {
-   einfo 'default configuration file is "~/.conkyrc"'
-   einfo "you can find a sample configuration file in"
-   einfo "/usr/share/doc/${PF}/conkyrc.sample.gz"
-   einfo
-   einfo "For more info on Conky's new features,"
-   einfo "please look at the README and ChangeLog:"
-   einfo "/usr/share/doc/${PF}/README.gz"
-   einfo "/usr/share/doc/${PF}/ChangeLog.gz"
-   einfo
-   einfo "Comment out temperature info lines if you have no kernel"
-   einfo "support for it."
-   einfo
-   ewarn "Conky doesn't work with window managers that"
-   ewarn "take control over root window such as Gnome's nautilus."
-} 
+	einfo 'Default configuration file is "~/.conkyrc"'
+	einfo "you can find a sample configuration file in"
+	einfo "/usr/share/doc/${PF}/conkyrc.sample.gz"
+	einfo
+	einfo "For more info on Conky's new features,"
+	einfo "please look at the README and ChangeLog:"
+	einfo "/usr/share/doc/${PF}/README.gz"
+	einfo "/usr/share/doc/${PF}/ChangeLog.gz"
+	einfo "There are also pretty html docs available"
+	einfo "on Conky's site or in /usr/share/doc/${PF}"
+	einfo
+	einfo "Check out app-vim/conky-syntax for conkyrc"
+	einfo "syntax highlighting in Vim"
+	einfo
+}
+
diff --git a/configure.in b/configure.in
index 05d672a2..0ebd65a0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-AC_INIT([Conky],[1.4.0],[brenden1@users.sourceforge.net])
+AC_INIT([Conky],[1.4.1-pre-cvs],[brenden1@users.sourceforge.net])
 
-AM_INIT_AUTOMAKE(conky, 1.4.0)
+AM_INIT_AUTOMAKE(conky, 1.4.1-pre-cvs)
 AM_CONFIG_HEADER(src/config.h)
 AC_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG([0.17.2])