diff --git a/README b/README
index 63fd3f91..25ce7e8b 100644
--- a/README
+++ b/README
@@ -943,4 +943,4 @@ AUTHORS
 
 
 
-				  2005-11-16			      conky(1)
+				  2006-01-01			      conky(1)
diff --git a/app-admin/conky/conky-1.3.5.ebuild b/app-admin/conky/conky-1.3.5.ebuild
new file mode 100644
index 00000000..5a306b8a
--- /dev/null
+++ b/app-admin/conky/conky-1.3.5.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+inherit eutils
+
+DESCRIPTION="Conky is an advanced, highly configurable system monitor for X"
+HOMEPAGE="http://conky.sf.net"
+SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="truetype X ipv6 bmpx"
+
+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
+			)
+	)"
+
+RDEPEND="${DEPEND_COMMON}"
+#	seti? ( sci-astronomy/setiathome )"
+
+DEPEND="
+	${DEPEND_COMMON}
+	X? (
+		|| ( ( x11-libs/libXt
+				x11-proto/xextproto
+				x11-proto/xproto
+				)
+				virtual/x11
+		)
+	)
+	sys-devel/libtool
+	sys-apps/grep
+	sys-apps/sed
+	sys-devel/gcc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+}
+
+src_compile() {
+	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
+		sleep 5
+	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 !ipv6 portmon) || die "econf failed"
+#		$(use_enable seti)
+	emake ${mymake} || die "compile failed"
+}
+
+src_install() {
+	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 "There are also pretty html docs available"
+	einfo "on Conky's site or in /usr/share/doc/${PF}"
+	einfo
+	einfo "Comment out temperature info lines if you have no kernel"
+	einfo "support for it."
+	einfo
+	einfo "Check out app-vim/conky-syntax for conkyrc"
+	einfo "syntax highlighting in Vim"
+	einfo
+	ewarn "Conky doesn't work with window managers that"
+	ewarn "take control over root window such as Gnome's nautilus."
+	ewarn
+}
diff --git a/doc/conky.1 b/doc/conky.1
index 55b0b534..2fe5f402 100644
--- a/doc/conky.1
+++ b/doc/conky.1
@@ -1,5 +1,5 @@
 .\" -*- coding: us-ascii -*-
-.TH conky 1 2005-11-16  
+.TH conky 1 2006-01-01  
 .SH NAME
 conky \- A system monitor for X originally based on the torsmo code, but more kickass. It just keeps on given'er. Yeah.
 .SH SYNOPSIS
diff --git a/doc/docs.xml b/doc/docs.xml
index 2b0974b4..facf87a9 100644
--- a/doc/docs.xml
+++ b/doc/docs.xml
@@ -16,7 +16,7 @@
       <firstname>Brenden</firstname>
       <surname>Matthews</surname>
     </author>
-    <date>2005-11-16</date>
+    <date>2006-01-01</date>
   </refentryinfo>
 
   <refmeta>