diff --git a/astro/osmosis/Makefile b/astro/osmosis/Makefile
index e7380c9b91cf..434dc5bb8afd 100644
--- a/astro/osmosis/Makefile
+++ b/astro/osmosis/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	osmosis
-PORTVERSION=	0.38
+PORTVERSION=	0.39
 CATEGORIES=	astro java
 MASTER_SITES=	http://bretth.dev.openstreetmap.org/osmosis-build/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	glebius@FreeBSD.org
+MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	A command line java app for processing OpenStreetMap data
 
 NO_BUILD=	yes
@@ -31,19 +31,20 @@ JARFILES=	aopalliance-1.0.jar \
 		commons-pool-1.5.4.jar \
 		jpf-1.5.jar \
 		mysql-connector-java-5.1.10.jar \
-		osmbin-1.0-6d760534.jar \
 		osmosis-apidb-${PORTVERSION}.jar \
 		osmosis-areafilter-${PORTVERSION}.jar \
-		osmosis-binary-${PORTVERSION}.jar \
 		osmosis-core-${PORTVERSION}.jar \
 		osmosis-dataset-${PORTVERSION}.jar \
 		osmosis-extract-${PORTVERSION}.jar \
-		osmosis-hstore-0.2.jar \
+		osmosis-hstore-${PORTVERSION}.jar \
+		osmosis-pbf-${PORTVERSION}.jar \
+		osmosis-pgsimple-${PORTVERSION}.jar \
 		osmosis-pgsnapshot-${PORTVERSION}.jar \
 		osmosis-replication-${PORTVERSION}.jar \
 		osmosis-set-${PORTVERSION}.jar \
 		osmosis-tagfilter-${PORTVERSION}.jar \
 		osmosis-xml-${PORTVERSION}.jar \
+		osmpbf-1.1.1-754a33af.jar \
 		plexus-classworlds-2.2.2.jar \
 		postgis-jdbc-1.3.3.jar \
 		postgresql-8.4-701.jdbc4.jar \
diff --git a/astro/osmosis/distinfo b/astro/osmosis/distinfo
index 5cb2cbac6f51..f0d6f93776f5 100644
--- a/astro/osmosis/distinfo
+++ b/astro/osmosis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (osmosis-0.38.tgz) = 226b83df5fce823f5ccd0573de1009780ae19c965c280466063ec987176dc82e
-SIZE (osmosis-0.38.tgz) = 7242741
+SHA256 (osmosis-0.39.tgz) = 8143bbe58b9ac2f7fa55a9e69d1fc407d1b786c31579b739b2b611268aad4fd3
+SIZE (osmosis-0.39.tgz) = 7408247
diff --git a/astro/osmosis/pkg-plist b/astro/osmosis/pkg-plist
index 7198d4a8e775..d49769b20acb 100644
--- a/astro/osmosis/pkg-plist
+++ b/astro/osmosis/pkg-plist
@@ -8,19 +8,20 @@ bin/osmosis
 %%DATADIR%%/lib/default/commons-pool-1.5.4.jar
 %%DATADIR%%/lib/default/jpf-1.5.jar
 %%DATADIR%%/lib/default/mysql-connector-java-5.1.10.jar
-%%DATADIR%%/lib/default/osmbin-1.0-6d760534.jar
-%%DATADIR%%/lib/default/osmosis-apidb-0.38.jar
-%%DATADIR%%/lib/default/osmosis-areafilter-0.38.jar
-%%DATADIR%%/lib/default/osmosis-binary-0.38.jar
-%%DATADIR%%/lib/default/osmosis-core-0.38.jar
-%%DATADIR%%/lib/default/osmosis-dataset-0.38.jar
-%%DATADIR%%/lib/default/osmosis-extract-0.38.jar
-%%DATADIR%%/lib/default/osmosis-hstore-0.2.jar
-%%DATADIR%%/lib/default/osmosis-pgsnapshot-0.38.jar
-%%DATADIR%%/lib/default/osmosis-replication-0.38.jar
-%%DATADIR%%/lib/default/osmosis-set-0.38.jar
-%%DATADIR%%/lib/default/osmosis-tagfilter-0.38.jar
-%%DATADIR%%/lib/default/osmosis-xml-0.38.jar
+%%DATADIR%%/lib/default/osmosis-apidb-0.39.jar
+%%DATADIR%%/lib/default/osmosis-areafilter-0.39.jar
+%%DATADIR%%/lib/default/osmosis-core-0.39.jar
+%%DATADIR%%/lib/default/osmosis-dataset-0.39.jar
+%%DATADIR%%/lib/default/osmosis-extract-0.39.jar
+%%DATADIR%%/lib/default/osmosis-hstore-0.39.jar
+%%DATADIR%%/lib/default/osmosis-pbf-0.39.jar
+%%DATADIR%%/lib/default/osmosis-pgsimple-0.39.jar
+%%DATADIR%%/lib/default/osmosis-pgsnapshot-0.39.jar
+%%DATADIR%%/lib/default/osmosis-replication-0.39.jar
+%%DATADIR%%/lib/default/osmosis-set-0.39.jar
+%%DATADIR%%/lib/default/osmosis-tagfilter-0.39.jar
+%%DATADIR%%/lib/default/osmosis-xml-0.39.jar
+%%DATADIR%%/lib/default/osmpbf-1.1.1-754a33af.jar
 %%DATADIR%%/lib/default/plexus-classworlds-2.2.2.jar
 %%DATADIR%%/lib/default/postgis-jdbc-1.3.3.jar
 %%DATADIR%%/lib/default/postgresql-8.4-701.jdbc4.jar