diff --git a/sys-block/partclone/ChangeLog b/sys-block/partclone/ChangeLog
index 37ce3170..a5ee61ea 100644
--- a/sys-block/partclone/ChangeLog
+++ b/sys-block/partclone/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sys-block/partclone
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*partclone-0.2.36 (19 Nov 2011)
+
+  19 Nov 2011; Mario Fetka <mario.fetka@gmail.com> -partclone-0.1.9.ebuild,
+  -partclone-0.2.8.ebuild, +partclone-0.2.36.ebuild, metadata.xml:
+  Bump & cleanup
+
   09 May 2010; Mario Fetka <mario.fetka@gmail.com> +partclone-0.2.8.ebuild,
   +metadata.xml:
   Initial checkin based on ebuild from systemrescuecd ebuild
diff --git a/sys-block/partclone/Manifest b/sys-block/partclone/Manifest
index e1fe03d9..9777c234 100644
--- a/sys-block/partclone/Manifest
+++ b/sys-block/partclone/Manifest
@@ -1,6 +1,4 @@
-DIST partclone_0.1.9-4.tar.gz 256852 RMD160 d4a4091d4f0064caaf9420bff6919ee57bba8d24 SHA1 cb5da09d724d07574d7ce18e2ebe91bab648d0ef SHA256 b8a4fd28b4f41bc5c53224665b40f385440ad6f290fe9576125da31e960e9114
-DIST partclone_0.2.8.tar.gz 276799 RMD160 c68938dc9f24112b8266c70fe989894de605e5c7 SHA1 f053bbfbd6e4384deb0f45480dcd72d2b0a1ff08 SHA256 24d3fc1071aff7a4add24b32804e579306cf5b4dd7234ec4baec7316294eb551
-EBUILD partclone-0.1.9.ebuild 1546 RMD160 2ab575a28d749cd143e366f0c471be2ead87a5e3 SHA1 eba8bee37ca7c1ab1bf5ab3563f9b5a14eaf250a SHA256 5a354c3485e00dae806a0de660ffc90d375ea389c1561a3cdea12253f335b6cf
-EBUILD partclone-0.2.8.ebuild 1548 RMD160 268464b1c8528feec36f34e3b7fff1cfc328291e SHA1 f33328cac2545f327af032a9b69b8caed876a979 SHA256 4ddefb5dc1c49a6034ad71b02d39b7d75009e0e3162ff974ff2b6c4c5ce98288
-MISC ChangeLog 275 RMD160 f38c8aa394918d56ca704cfc44eed6465e6c8785 SHA1 cf22761cac0965be9462a7103d429cf29335aed3 SHA256 e81505e9c0dd3028025d0a1a10e46426235bc70f8da540daf08785e9271b2287
-MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
+DIST partclone_0.2.36.tar.gz 424316 RMD160 5ab453fe618b9f9d66619763c6f5a9cf47da1e60 SHA1 105aae4be93387bdf0cb6ae29ce69e5d33226d35 SHA256 434f56ca986284a64bfee2d98862d32313d127b9c382c7b4016407ada04832a2
+EBUILD partclone-0.2.36.ebuild 1568 RMD160 e7b4f6edd2520009131b296ddf6c8149cf5656e5 SHA1 af6e77a5a4491301cb8208ae703d9497faa1b4a5 SHA256 762306e2759a3f60a03c2aa3d7c39c155f923b179b18bdc8274c75844bd117e6
+MISC ChangeLog 469 RMD160 d603c14cebf64dd5adec0c35592b473e810ea1a8 SHA1 43d0ecb1c249ac37b51dc7c9484472357880bdc1 SHA256 a4dd01367c564d169e246cf6690532d415981cb63951816d82ed5f3ebfe3e680
+MISC metadata.xml 205 RMD160 f85e91d792c694cb3e45fac26295dba0e6e43786 SHA1 3f13c3b49579342e2308323aa3dda2f43dd94c23 SHA256 9fdfc9c91107d94feb8416adc2cec7734fa27084bff83ea859938b3216e028bc
diff --git a/sys-block/partclone/metadata.xml b/sys-block/partclone/metadata.xml
index 46a44e57..0830b325 100644
--- a/sys-block/partclone/metadata.xml
+++ b/sys-block/partclone/metadata.xml
@@ -1,34 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<!-- 
-$Header: /var/cvsroot/gentoo-x86/skel.metadata.xml,v 1.18 2008/07/28 19:27:05 cardoe Exp $
-
-This is the example metadata file.
-The root element of this file is <pkgmetadata>. Within this element a 
-number of subelements are allowed: herd, maintainer, and 
-longdescription. herd is a required subelement.
-
-For a full description look at:
-http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml?part=2&chap=4
-
-
-Before committing, please remove the comments from this file. They are 
-not relevant for general metadata.xml files.
--->
 <pkgmetadata>
-<herd>no-herd</herd>
 <maintainer>
-  <email>@gentoo.org</email>
-<!--  <description>Description of the maintainership</description> -->
+  <email>mario.fetka@gmail.com</email>
 </maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
-<!--
-<use>
-  <flag name='flag'>Description of how USE='flag' affects this package</flag>
-  <flag name='userland_GNU'>Description of how USERLAND='GNU' affects this
-	  package</flag>
-  <flag name='aspell'>Uses <pkg>app-text/aspell</pkg> for spell checking.
-	  Requires an installed dictionary from <cat>app-dicts</cat></flag>
-</use>
--->
 </pkgmetadata>
diff --git a/sys-block/partclone/partclone-0.1.9.ebuild b/sys-block/partclone/partclone-0.1.9.ebuild
deleted file mode 100644
index 3c8fc643..00000000
--- a/sys-block/partclone/partclone-0.1.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-inherit eutils
-
-DESCRIPTION="Partition cloning tool"
-HOMEPAGE="http://partclone.org"
-SRC_URI="mirror://sourceforge/partclone/partclone_0.1.9-4.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="xfs reiserfs reiser4 hfs fat ntfs "
-
-RDEPEND="${common_depends}
-	>=sys-fs/e2fsprogs-1.41.4
-	fat? ( sys-fs/dosfstools )
-	ntfs? ( sys-fs/ntfsprogs )
-	hfs? ( sys-fs/hfsutils )
-	jfs? ( sys-fs/jfsutils )
-	reiserfs? ( sys-fs/progsreiserfs )
-	reiser4? ( sys-fs/reiser4progs )
-	xfs? ( sys-fs/xfsprogs )"
-DEPEND=""
-
-src_unpack()
-{
-	unpack ${A}
-	#mv partclone partclone-${PV}
-	cd ${S}
-}
-
-src_compile() 
-{
-	local myconf
-	myconf="${myconf} --enable-extfs --enable-ncursesw"
-	use xfs && myconf="${myconf} --enable-xfs"
-	use reiserfs && myconf="${myconf} --enable-reiserfs"
-	use reiser4 && myconf="${myconf} --enable-reiser4"
-	use hfs && myconf="${myconf} --enable-hfsp"
-	use fat && myconf="${myconf} --enable-fat"
-	use ntfs && myconf="${myconf} --enable-ntfs"
-	use xfs && myconf="${myconf} --enable-xfs"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "make failed"
-}
-
-src_install()
-{
-	#emake install || die "make install failed"
-	#emake DIST_ROOT="${D}" install || die "make install failed"
-	cd ${S}/src
-	dosbin partclone.dd partclone.restore partclone.chkimg
-	dosbin partclone.extfs
-	use xfs && dosbin partclone.xfs
-	use reiserfs && dosbin partclone.reiserfs
-	use reiser4 && dosbin partclone.reiser4
-	use hfs && dosbin partclone.hfsp
-	use fat && dosbin partclone.fat
-	use ntfs && dosbin partclone.ntfs
-	use ntfs && dosbin partclone.ntfsfixboot
-}
-
diff --git a/sys-block/partclone/partclone-0.2.8.ebuild b/sys-block/partclone/partclone-0.2.36.ebuild
similarity index 82%
rename from sys-block/partclone/partclone-0.2.8.ebuild
rename to sys-block/partclone/partclone-0.2.36.ebuild
index aa00688f..18b807ec 100644
--- a/sys-block/partclone/partclone-0.2.8.ebuild
+++ b/sys-block/partclone/partclone-0.2.36.ebuild
@@ -1,3 +1,9 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
 inherit eutils
 
 DESCRIPTION="Partition cloning tool"
@@ -7,27 +13,19 @@ SRC_URI="mirror://sourceforge/partclone/partclone_${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="xfs reiserfs reiser4 hfs fat ntfs "
+IUSE="xfs reiserfs reiser4 hfs fat ntfs jfs"
 
-RDEPEND="${common_depends}
-	>=sys-fs/e2fsprogs-1.41.4
+DEPEND=">=sys-fs/e2fsprogs-1.41.4
 	fat? ( sys-fs/dosfstools )
 	ntfs? ( sys-fs/ntfsprogs )
 	hfs? ( sys-fs/hfsutils )
 	jfs? ( sys-fs/jfsutils )
 	reiserfs? ( sys-fs/progsreiserfs )
 	reiser4? ( sys-fs/reiser4progs )
-	xfs? ( <=sys-fs/xfsprogs-3 )"
-DEPEND=""
+	xfs? ( sys-fs/xfsprogs )"
+RDEPEND="${DEPEND}"
 
-src_unpack()
-{
-	unpack ${A}
-	#mv partclone partclone-${PV}
-	cd ${S}
-}
-
-src_compile() 
+src_configure()
 {
 	local myconf
 	myconf="${myconf} --enable-extfs --enable-ncursesw"
@@ -40,7 +38,6 @@ src_compile()
 	use xfs && myconf="${myconf} --enable-xfs"
 
 	econf ${myconf} || die "econf failed"
-	emake || die "make failed"
 }
 
 src_install()