diff --git a/MOVED b/MOVED
index ab7cdbbc2bf6..b55f7ef8ef27 100644
--- a/MOVED
+++ b/MOVED
@@ -5297,3 +5297,4 @@ deskutils/taskjuggler|deskutils/rubygem-taskjuggler|2013-12-05|Rename to match o
 www/clickheat||2013-12-07|Has expired: No more activity since 2011
 security/pdfcrack||2013-12-08|Has expired: Not active since several years
 security/rarcrack||2013-12-08|Has expired: Not active since several years
+java/subversion-java|java/java-subversion|2013-12-08|Rename to reflect subversion child port naming scheme
diff --git a/UPDATING b/UPDATING
index ff7ab5664469..51f5d0674e1f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,19 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20131208:
+  AFFECTS: users of java/subversion-java
+  AUTHOR: ohauer@FreeBSD.org
+
+  java/subversion-java was moved to java/java-subversion.
+  Please do the following according to package manager used.
+
+  # portmaster -o java/java-subversion java/subversion-java
+    or
+  # portupgrade -fo java/java-subversion java/subversion-java
+    or
+  # pkg set -o java/subversion-java:java/java-subversion
+
 20131208:
   AFFECTS: users of x11-toolkits/vte
   AUTHOR: kwm@FreeBSD.org
diff --git a/java/subversion-java/Makefile b/java/java-subversion/Makefile
similarity index 92%
rename from java/subversion-java/Makefile
rename to java/java-subversion/Makefile
index 70d70e7d2303..81aae13b0c8c 100644
--- a/java/subversion-java/Makefile
+++ b/java/java-subversion/Makefile
@@ -1,7 +1,7 @@
 # Created by: Lev Serebryako <lev@FreeBSD.org>
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-java
+PKGNAMEPREFIX=	java-
 CATEGORIES=	java
 
 MAINTAINER=	lev@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT=	Java bindings for Version control system
 .if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
 MASTERDIR=	${.CURDIR}/../../devel/subversion16
 .elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
-MASTERDIR=	${.CURDIR}/../../devel/subversion16
+MASTERDIR=	${.CURDIR}/../../devel/subversion17
 .else
 MASTERDIR=	${.CURDIR}/../../devel/subversion
 .endif
diff --git a/java/subversion-java/pkg-descr b/java/java-subversion/pkg-descr
similarity index 100%
rename from java/subversion-java/pkg-descr
rename to java/java-subversion/pkg-descr
diff --git a/java/subversion-java/pkg-plist b/java/java-subversion/pkg-plist
similarity index 100%
rename from java/subversion-java/pkg-plist
rename to java/java-subversion/pkg-plist