diff --git a/www-misc/firefox-bookmarks/Manifest b/www-misc/firefox-bookmarks/Manifest
index b8dc3e779..192f4fdc8 100644
--- a/www-misc/firefox-bookmarks/Manifest
+++ b/www-misc/firefox-bookmarks/Manifest
@@ -1,2 +1,5 @@
+AUX pentoo-bookmarks-0.3.html 4990 SHA256 5a4f4170e834739c1232d511fb7f1b4a31bcff21a7dba33edbbccff34b239949 SHA512 0b5aab5a7874c14af79e052d4dc1cd67a12f2b187cae089bfdf72a1bd5ee015ffc8787f0b77db94e279f2dfded31323040cf6adc0d2e0bc917bf178cca1c7290 WHIRLPOOL 6ed8c7d8ea8ed31fa6ce8e6f5f12252bda9c771b25eed03ddf6a44aed910a2a83f6d489e8d31a470474245278971cdf74f9b30758afb5267d6aeb8d044a4e2a0
DIST mozilla.0.3.tar.bz2 12514 SHA256 756b6769eb903cfb4c8728519fa872a77d5ece5334cf671af5166d5497a4a4ee SHA512 649c5f48eb344f0c230b138110f486486f4901272e7210b9b97ee482954f0dc2db90b89fe1ceffd98c682b98d263220bb39aebbb80a1db3c395bb3540aadb48a WHIRLPOOL c4c3faf0d96dc9d4d4c281a4603d178a62c3da378ec311607e9a00764a75693ccc5999f4aeae734ab749af5e4c2e2bbb59721cd71c09730a41a8e2365b07ccd9
+EBUILD firefox-bookmarks-0.3-r1.ebuild 658 SHA256 0167706548fe74c63ba3f6c42a58e78ae010409a926dd79ba85c94f6ab678192 SHA512 aa05ada15c73e25a44160d2709ed6bc07c88ae3cac632eb16a705520d0627eb942885e1b554c46ae39d19674de375edba7ee7fed91a8670ec6006bfa644e5e90 WHIRLPOOL e2e6bba6465ba19e6865b0e4f585b792716801cda66b11ae2291fbdf7447211eb73bee2fc8b39eda5c84a0da80c55c8f8ba4646ebddb36371a2c8db4538b70c6
EBUILD firefox-bookmarks-0.3.ebuild 703 SHA256 d1752a6a1e5f03a9fde52f1bb09deadafc1ef2b83c2a9751b3d39c2cdec94873 SHA512 9a7fe976d830951ff21fc961c93d29f18a2d139e4f4d52353287032a2e1c1372fd01bd553cd02e774e14ca42abebd58c3565a8e6682b6f79e2e5a17520b405ca WHIRLPOOL c1bcc67d1bd9511c8dd549ee7e838b3067c84cae588acd3090b9599284e3747cd23395fd7fa92a83c11a267d4083c853a7cfc99c155111bf6452f4bad0fcd78a
+MISC toto.desktop 136 SHA256 18e078e83274ab6a2865e89146b81bd1fe4f1cb97abf883b592f65c4ad122047 SHA512 25c657d2672a1cb3d1e76ad9a09d61a5f9568586013ae43a6f5a01c399771652d76e7c229ea6881a35c730668c575201988b1824aa5451e2b0445f969b325bf0 WHIRLPOOL 202b036bd353adaedf74768c2941e9d2c00d9d2ec296c5e2b6cdb142479e43475df3113d892a37592e23b8786a41b0745e68ced4afc2d1a328908edb60a749db
diff --git a/www-misc/firefox-bookmarks/files/pentoo-bookmarks-0.3.html b/www-misc/firefox-bookmarks/files/pentoo-bookmarks-0.3.html
new file mode 100644
index 000000000..f241dfb16
--- /dev/null
+++ b/www-misc/firefox-bookmarks/files/pentoo-bookmarks-0.3.html
@@ -0,0 +1,24 @@
+
+
+
+Bookmarks
+Bookmarks
+
+
+
Bookmarks Toolbar Folder
+- Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
+
+
- Getting Started
+
+
pentoo
+
+
- pentoo - Pentoo Penetration Testing Overlay and Livecd - Google Project Hosting
+
- Pentoo Forums • Index page
+
- 1337day Inj3ct0r Exploit Database : vulnerability : 0day : shellcode by Inj3ct0r Team
+
- 1337day Inj3ct0r Exploit Database : vulnerability : 0day : shellcode by Inj3ct0r Team
+
- Aircrack-ng
+
- BookmarksList - pentest-bookmarks - Bookmarks List - Open Penetration Testing Bookmarks Collection - Google Project Hosting
+
+
diff --git a/www-misc/firefox-bookmarks/firefox-bookmarks-0.3-r1.ebuild b/www-misc/firefox-bookmarks/firefox-bookmarks-0.3-r1.ebuild
new file mode 100644
index 000000000..e89158cea
--- /dev/null
+++ b/www-misc/firefox-bookmarks/firefox-bookmarks-0.3-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Firefox bookmarks for the Pento ISO only"
+HOMEPAGE="http://code.google.com/p/pentoo"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND} || (
+ >=www-client/firefox-bin-15.0.1
+ >=www-client/firefox-15.0.1
+)"
+
+S="${WORKDIR}"
+MOZ_PN="firefox"
+
+src_prepare() {
+ cp "${FILESDIR}/pentoo-bookmarks-${PV}.html" bookmarks.html || die
+}
+
+src_compile(){
+ return
+}
+
+src_install(){
+ declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+ insinto ${MOZILLA_FIVE_HOME}/defaults/profile/
+ doins bookmarks.html
+}
diff --git a/www-misc/firefox-bookmarks/firefox-bookmarks-0.3.ebuild b/www-misc/firefox-bookmarks/firefox-bookmarks-0.3.ebuild
deleted file mode 100644
index 41c698765..000000000
--- a/www-misc/firefox-bookmarks/firefox-bookmarks-0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-DESCRIPTION="Firefox bookmarks for the Pento ISO only"
-HOMEPAGE="https://code.google.com/p/pentoo/source/browse/firefox-bookmarks/Read.me"
-SRC_URI="https://pentoo.googlecode.com/svn-history/r3822/firefox-bookmarks/mozilla.${PV}.tar.bz2"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND} || (
- =www-client/firefox-bin-15.0.1
- =www-client/firefox-15.0.1
-)"
-
-S="${WORKDIR}"
-
-pkg_setup(){
- if [ -e /root/.mozilla ]; then
- die "/root/.mozilla already exists!"
- fi
-}
-
-src_compile(){
- return
-}
-
-src_install(){
- insinto /root
- doins -r .mozilla
-}