diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index 42250d3..1d7f533 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,5 +1,7 @@
 AUX passwordsafe-3.31.diff 4215 SHA256 d1d46ce22e431aa3c72601a08dfd193477da576b717bd775abb34b16f6712b25 SHA512 aebda1e1c2ab96e2242460bed2fb45d6406404ba381eaf868e88bd60f98e0da8b671ce182447915037deb3563665c351a822ff36867493b17f343aa82f3ed3d2 WHIRLPOOL a8c763a20a89196e99709ffdaad96be8021f7573212b695e3a8e8604da9febf4917c90e8cfb216b74fef92bda7b123d709790aa6405710b284c378fe63ff6e5d
 DIST pwsafe-3.31Y-src.zip 16792748 SHA256 344b69de26dce0ca45d5ff777282077cf6d18eda1e189a1e06d8de2e21c1866f SHA512 e6e193025ec90685120b6b9d2a67b56f4b44b31089f56bf4e561e80c76ab044d96079e26ddc957ebf632673a7e4f28c3bf51890388da123b8257da9d51964e4b WHIRLPOOL 0380b530c75ccab90123ee94d168e56a022ceab6360a2230fba33650eba60a0f56c761b790d8d32885a2f4f60aa4f1848837487d88353923de1774ab9be4132c
 DIST pwsafe-3.32-src.zip 17534733 SHA256 279e70181dbfb16475fe7edece5afbefd958270ab87dc367d820fe0e4f2187d9 SHA512 b1d41535c641228d0a28d3c9c8aafbedd39b1c1584b70a19eecc1fe01281e82ee2e9d9f4ee1af80d00060dfcaf49848fdb3c3d7b8088f98b6c6ae781d770c35a WHIRLPOOL b7fc9be711241cd344cceb89d1cc85e6c2ffd7c6c3f4604337d5c25acbd7726060411b2dfab1fa52ba8eb9f42d1dd91cf9067e8e9ed6d441a37d55f445f2a826
+DIST pwsafe-3.33-src.zip 15176138 SHA256 2fea7f92f1fd544b1cabaef2ec8f44017477992b1be9838c5d418e363b72e01e SHA512 040861e3df3d880631e7e0ce86a4b32553b6f1ca9c7a1d3b75fe0afde2269709b0f2ac719fc38693822fad05e02f219e81b03ff6f7a709e6b41699e990a60e49 WHIRLPOOL 70402e4621f7913b70ab0d4664ec3a775b38db505ec4ac38082eed8b1f8b90a18163ee99a0c76af318af31bcb43086a42325e6554395369e8536994c377286fb
 EBUILD passwordsafe-3.31.ebuild 1602 SHA256 2da8408604ebb9cfa194bcc7bfac573e808abc130f4fa1443ff4bbb28fb944f4 SHA512 dde81b22abe3dbef4c4e136c69435b749b494d248d3fa39787ffc93ae38c3551be0f63c932056d8c286d9bce96a0432ad4e87435d87d1809c677d6f239d3f306 WHIRLPOOL e15788286811d0a8e0f001bbd5d663ae1f0c9d3b4707e008d2a55ac0c0bb7e854ed5ecd081fc36af47d334f94151b18e6ee2137ef2360265b440ec14317cec8c
 EBUILD passwordsafe-3.32.ebuild 1636 SHA256 81312920fe03b73dc1c5e0a7a76087c4d42b159d878cdb196c4093ab3b9b5c58 SHA512 589bf618e5896534678f27668ca2dc66de84f9aeb8fcb16ce20b5c9a268b579e452259d78173d4aa791e648414782ddbf01e296be3ab92000ba0a1db58901905 WHIRLPOOL 549b876cda59c3cfd126fe0b0e9f08847ada0cd1e71c668469d45f1991730e5aad9823a39a84e0fcd5da1fdca4240b0805863ca839fe00e9b0c5a800a0b140df
+EBUILD passwordsafe-3.33.ebuild 1636 SHA256 81312920fe03b73dc1c5e0a7a76087c4d42b159d878cdb196c4093ab3b9b5c58 SHA512 589bf618e5896534678f27668ca2dc66de84f9aeb8fcb16ce20b5c9a268b579e452259d78173d4aa791e648414782ddbf01e296be3ab92000ba0a1db58901905 WHIRLPOOL 549b876cda59c3cfd126fe0b0e9f08847ada0cd1e71c668469d45f1991730e5aad9823a39a84e0fcd5da1fdca4240b0805863ca839fe00e9b0c5a800a0b140df
diff --git a/app-admin/passwordsafe/passwordsafe-3.33.ebuild b/app-admin/passwordsafe/passwordsafe-3.33.ebuild
new file mode 100644
index 0000000..84df4d7
--- /dev/null
+++ b/app-admin/passwordsafe/passwordsafe-3.33.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+WX_GTK_VER="2.8"
+
+inherit wxwidgets autotools
+
+DESCRIPTION="Password manager with yubikey support"
+HOMEPAGE="http://passwordsafe.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/pwsafe-${PV}-src.zip"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+RDEPEND=">=sys-auth/ykpers-1.11
+         dev-libs/xerces-c"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/pwsafe-${PV}-src
+
+src_prepare() {
+        sed -i -e "s/\r//" src/ui/wxWidgets/version.in \
+        || die "sed remove CR from version.in failed"
+        sed -i -e "s:/usr/local/include/ykpers-1:/usr/include/ykpers-1:" src/os/linux/Makefile \
+        || die "sed ykpers include failed"
+        sed -i -e "s:/usr/share/doc/passwordsafe/help/:/usr/share/pwsafe/help/:" src/os/linux/dir.cpp \
+        || die "sed helpdir failed"
+}
+
+src_compile() {
+        emake I18N release || die "emake I18N release failed"
+        emake -C help || die "emake help failed"
+}
+
+src_install() {
+        dobin src/ui/wxWidgets/GCCUnicodeRelease/pwsafe
+
+        insinto /usr/share/locale
+        doins -r src/ui/wxWidgets/I18N/mos/*
+
+        insinto /usr/share/pwsafe/xml
+        doins xml/pwsafe.xsd xml/pwsafe_filter.xsd xml/pwsafe.xsl xml/KPV1_to_PWS.xslt xml/KPV2_to_PWS.xslt
+
+        insinto /usr/share/pwsafe/help
+        doins help/help.zip
+
+        domenu install/desktop/pwsafe.desktop
+        doicon install/graphics/pwsafe.png
+
+        doman docs/pwsafe.1
+        dodoc README.txt docs/ReleaseNotes.txt docs/ChangeLog.txt
+}