diff --git a/app-forensics/origami-pdf/Manifest b/app-forensics/origami-pdf/Manifest
new file mode 100644
index 000000000..cab3c3672
--- /dev/null
+++ b/app-forensics/origami-pdf/Manifest
@@ -0,0 +1,4 @@
+AUX origami 64 SHA256 f5a31de31b05c4305a13ac15b1f583d15b2b1376a208d6f0298ab89977dbb713 SHA512 9e47089937824f20b37e3a247d4c75add6cc43c10aad380da5c06b449d76b03a701b7fe50a547202e4bddc295060783b7cfb245d4dde8e13775fdd637759d95c WHIRLPOOL 8f0fbd0ca303b0fa668be9e800f5879b22e5f51c378b12bda342f906ad1bcc80b43ce457d87968261591255341960bb1179eb9d760505fac69c1315c19389d80
+AUX origami-sym 63 SHA256 f7468f50ddba05d11bdc32aff1d40457eb0bdab118f602f1afc25195126cdeae SHA512 718a91c5ce54b3e7e3ce6a0bfe2ccd73a6a21759c16d0f0a4e48d572751c9da572fb0d5415c29ff779884a3fc167d9bdb8dd932fb28879d48f8d5b0b93c79950 WHIRLPOOL d7c9d6b77497eb5bda99cb314ae4fb20f8f6d22f8dbe1955f51a475888248d2bfed40ee2b7042e6183ea99c410d8cb36d2c41d4eb791439fefed6268df734f18
+DIST origami-pdf-1.2.6.tar.gz 1941924 SHA256 1fb6187c1d1e3e88aca929fae9f6c6a76d37359157b412a03c3e20605775caee SHA512 5923440bef3a366fcafa623d2ee43c0669b086eca6ece6282171c1c78ac3eacb8e8e2471f3df2c45fdebb874e109c0af58d4143301ec200eb3edeefb8311b5a2 WHIRLPOOL d3d6ccd72164929a7ada4d98c0c18666c113129424cb9d78f92eb2d71a92c9f2b5fb45c7741c19910d0288505699df221315b3f4256e57ffd3b186402d5f3b92
+EBUILD origami-pdf-1.2.6.ebuild 1103 SHA256 3e0e0966da8fa44591e60c2a6991ad3bd355c6da277a18b6b4a21254d41d1b1a SHA512 4e4ca39705ab6e472251a29570ac39fc51d1a690294b92cf1b067dd172de0547b8038f428fd58c2c553cb39e2ca8841553bb0ac4d000910d0ba9518688e2d94e WHIRLPOOL 62960f2eae1f03bab9cd14c00c629cc5c3f24ed9e01fa8c134f2967f780665f9b76980d4d8924c9cef9161396baa5489ddf53e884629925589232a9317333e80
diff --git a/app-forensics/origami/files/origami b/app-forensics/origami-pdf/files/origami
similarity index 56%
rename from app-forensics/origami/files/origami
rename to app-forensics/origami-pdf/files/origami
index 2b36fdc23..5a4339fb5 100644
--- a/app-forensics/origami/files/origami
+++ b/app-forensics/origami-pdf/files/origami
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-cd /usr/lib/origami/scripts
+cd /usr/lib/origami/samples
 cat README.txt
 /bin/bash
diff --git a/app-forensics/origami-pdf/files/origami-sym b/app-forensics/origami-pdf/files/origami-sym
new file mode 100644
index 000000000..9ec08c27f
--- /dev/null
+++ b/app-forensics/origami-pdf/files/origami-sym
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+me=`basename $0`
+
+cd /usr/lib/origami-pdf
+./bin/$me
diff --git a/app-forensics/origami-pdf/origami-pdf-1.2.6.ebuild b/app-forensics/origami-pdf/origami-pdf-1.2.6.ebuild
new file mode 100644
index 000000000..642c3cb17
--- /dev/null
+++ b/app-forensics/origami-pdf/origami-pdf-1.2.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A Ruby framework designed to parse, analyze, and forge PDF documents"
+HOMEPAGE="https://code.google.com/p/origami-pdf/"
+SRC_URI="https://github.com/cogent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gtk"
+
+RDEPEND="dev-lang/ruby
+	dev-ruby/rubygems
+	gtk? ( dev-ruby/ruby-gtk2 )"
+DEPEND=""
+
+src_install() {
+	# should be as simple as copying everything into the target
+	dodir /usr/$(get_libdir)/${PN}
+	cp -R "${S}"/* "${ED}"/usr/$(get_libdir)/${PN} || die "Copy files failed"
+	fowners -R root:0 /
+
+	dodoc README CHANGELOG
+
+	#we use a first bin file as a template for the rest
+	newbin "${FILESDIR}/origami-sym" pdfdecompress
+	for pdfname in "pdfdecrypt" "pdfencrypt" "pdfmetadata" "pdf2graph" "pdf2ruby" "pdfextract" \
+		"pdfcop" "pdfcocoon" "pdfsh" "pdfwalker" "pdf2pdfa"
+	do
+		dosym /usr/bin/pdfdecompress /usr/bin/$pdfname
+	done
+	use gtk && dosym /usr/bin/pdfwalker /usr/bin/$pdfname
+}
diff --git a/app-forensics/origami/Manifest b/app-forensics/origami/Manifest
deleted file mode 100644
index d6e3fe77e..000000000
--- a/app-forensics/origami/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX origami 64 RMD160 63ff10c1c294e37aa9819fa1e8260f6cf77ff3c2 SHA1 febb5a219fa746192e9d40f15e3c6a5151500e63 SHA256 89c8cfc873764c8abf03197dbb07d190757a5a4b4d51ddbdb5830544848ca9ac
-AUX origami-gui 53 RMD160 31446d4e4c57fc4fc148a76a3eb53938c2103760 SHA1 953b5c2f6d7d4ceb75c71e2093016878acdd67e8 SHA256 32290a24f8303f2dc7652959d43c8449c5d2224675e10d2f658c99d764aed757
-DIST origami-1.0.0-beta1b.tar.gz 2804807 RMD160 cca690ce87e4b611f9d9b4c7bc27d2d0d90c61c3 SHA1 12585cc4f152a3ca171a18038514812989149085 SHA256 2835cf1b6c7ac1c9ca03f1e121ebc468cc1921a1cd4e7dc5c4ed42844c9a799c
-EBUILD origami-1.0.0_beta.ebuild 795 RMD160 05ae68d1e8731161a9f02771f06697699fb75e3f SHA1 7fcd994ef2d56e8f8a270fe8615a4ddbaa3232f4 SHA256 a98b6d49d15243e8cdb63700d25aa91be573b91eb2495013bc12d635aadda698
diff --git a/app-forensics/origami/files/origami-gui b/app-forensics/origami/files/origami-gui
deleted file mode 100644
index a619802d9..000000000
--- a/app-forensics/origami/files/origami-gui
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd /usr/lib/origami/walker
-ruby walker.rb
diff --git a/app-forensics/origami/origami-1.0.0_beta.ebuild b/app-forensics/origami/origami-1.0.0_beta.ebuild
deleted file mode 100644
index cb5c100b7..000000000
--- a/app-forensics/origami/origami-1.0.0_beta.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: Exp $
-
-MY_P="${P/_/-}1b"
-SRC_URI="http://security-labs.org/origami/files/${MY_P}.tar.gz"
-DESCRIPTION="A Ruby framework designed to parse, analyze, and forge PDF documents"
-HOMEPAGE="http://security-labs.org/origami/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="dev-lang/ruby
-	dev-ruby/rubygems
-	gtk? ( dev-ruby/ruby-gtk2 )"
-DEPEND=""
-
-S="${WORKDIR}/${P/_/-}1"
-src_install() {
-	# should be as simple as copying everything into the target...
-	dodir /usr/lib/${PN}
-	cp -pR "${S}"/sources/* "${D}"/usr/lib/${PN} || die "Copy files failed"
-	cd doc && dodoc *
-	chown -R root:0 "${D}"
-	dobin "${FILESDIR}/origami"
-	use gtk && dobin "${FILESDIR}/origami-gui"
-}
diff --git a/pentoo/pentoo-forensics/Manifest b/pentoo/pentoo-forensics/Manifest
index 8852df544..7e5f2d447 100644
--- a/pentoo/pentoo-forensics/Manifest
+++ b/pentoo/pentoo-forensics/Manifest
@@ -1 +1 @@
-EBUILD pentoo-forensics-2013.0.ebuild 790 SHA256 cfc9a9673b4b7bf9ef30fdc7a0dfe362a22ee3d76106571bb59010b18ca13939 SHA512 e97f7f06de742a6e4f17df03ff743ca1f5d3d95443aa5edd6f39bc000126b8bb73bbf1ab5989051efe1519be5799039168164d8f5ca02f56f960c82100b97e25 WHIRLPOOL 2ec088e54a1b5b047d33f3280bb47085c1bec857c7cc39b10229f4642396e006986706550951ef7dd61ae0089c3b8eae4748ef9f18b8b7439b6f3e2dd8d558a5
+EBUILD pentoo-forensics-2013.0-r1.ebuild 796 SHA256 4520fe669afb4a3b0ef5a3004b2449b993e4d5bc376c096d8f1e444ae36209b7 SHA512 818dd3f45c80e224bb298f7e57bcdde2f5b4006ba9c1d3572cadff7d4dddb4f4e0c8a1fbfff0fbd6058d66ca74b638bba7d817288785012509893e142434c583 WHIRLPOOL c758c2e981b6892c3230c019bf3d9af987ae7cd37efd23eb7ac17d0db1358c15f69b8df5c48b1e9ba98ecb8cfabcb380444f490c2451a85d7a6fa17be5116b60
diff --git a/pentoo/pentoo-forensics/pentoo-forensics-2013.0.ebuild b/pentoo/pentoo-forensics/pentoo-forensics-2013.0-r1.ebuild
similarity index 93%
rename from pentoo/pentoo-forensics/pentoo-forensics-2013.0.ebuild
rename to pentoo/pentoo-forensics/pentoo-forensics-2013.0-r1.ebuild
index e8b5dfe48..bc355491c 100644
--- a/pentoo/pentoo-forensics/pentoo-forensics-2013.0.ebuild
+++ b/pentoo/pentoo-forensics/pentoo-forensics-2013.0-r1.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 
 DESCRIPTION="Pentoo forensics meta ebuild"
 HOMEPAGE="http://www.pentoo.ch"
 
-LICENSE="GPL"
+LICENSE="GPL-3"
 SLOT="0"
 IUSE="livecd"
 KEYWORDS="~amd64 ~x86"
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
 	app-forensics/libvshadow
 	app-forensics/make-pdf
 	app-forensics/memdump
-	app-forensics/origami
+	app-forensics/origami-pdf
 	app-forensics/pasco
 	app-forensics/pdf-parser
 	app-forensics/pdfid