diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
new file mode 100644
index 0000000..e0112cf
--- /dev/null
+++ b/sci-geosciences/josm/Manifest
@@ -0,0 +1,2 @@
+DIST josm-4667.tar.xz 15080308 RMD160 9e194899ac448052e455f64154f41413615d5070 SHA1 a091d0965f69e838a27da34b6a40d36a12b1bca4 SHA256 aad246602688e613ac2b0deb2390a8443b5b3e98206ff4e7c346dddd8b7e02e3
+EBUILD josm-4667.ebuild 1627 RMD160 f2a13f9aa020c456a2b8e083475f62ad7435b936 SHA1 8c7180e5a2e2eefe0dadd55c5d7fc8953d68111c SHA256 f15afe516eda25d4c881c3cb9c5e08336ec982c443d6ddaa9aea8ac786d6365d
diff --git a/sci-geosciences/josm/josm-4667.ebuild b/sci-geosciences/josm/josm-4667.ebuild
new file mode 100644
index 0000000..d0daca9
--- /dev/null
+++ b/sci-geosciences/josm/josm-4667.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/josm/josm-4550.ebuild,v 1.1 2011/11/24 18:55:06 hanno Exp $
+
+EAPI=4
+
+JAVA_ANT_ENCODING=UTF-8
+
+[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
+inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
+unset SUBVERSION_ECLASS
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="http://josm.openstreetmap.de/"
+[[ ${PV} == "9999" ]] || SRC_URI="http://josm.fabian-fingerle.de/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ ${PV} == "9999" ]] || KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}"
+
+IUSE=""
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]]; then
+		sed -i \
+			-e "s:josm-custom.jar:josm.jar:" \
+			-e "s:josm-custom-optimized.jar:josm-optimized.jar:" \
+			build.xml || die "Sed failed"
+
+		# create-revision needs the compile directory to be a svn directory
+		# see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
+		sed -i \
+			-e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \
+			build.xml || die "Sed failed"
+	fi
+}
+
+src_compile() {
+	eant dist-optimized
+}
+
+src_install() {
+	java-pkg_newjar "dist/${PN}-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
+
+	newicon images/logo.png josm.png || die "newicon failed"
+	make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Science;Geoscience"
+}