diff --git a/databases/postgresql-jdbc/Makefile b/databases/postgresql-jdbc/Makefile
index 2f7dc7806d33..b5df2886ed30 100644
--- a/databases/postgresql-jdbc/Makefile
+++ b/databases/postgresql-jdbc/Makefile
@@ -21,18 +21,15 @@ DIST_SUBDIR=	postgresql
 
 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION?=	"1.1+"
 USE_REINPLACE=	yes
 
 PKGMESSAGE=	${WRKDIR}/.pkg-message
 
 post-patch:
-	${REINPLACE_CMD} 's,/usr/local/pgsql/share/java,${PREFIX}/share/java/classes,' ${WRKSRC}/README
+	${REINPLACE_CMD} 's,/usr/local/pgsql/share/java,${JAVAJARDIR},' ${WRKSRC}/README
 
 do-install:
-	@- ${MKDIR} -m 0755 ${PREFIX}/share/java/classes ;\
-	  ${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar \
-		${PREFIX}/share/java/classes/postgresql.jar ;\
+	@- ${INSTALL_DATA} ${WRKSRC}/jars/postgresql.jar ${JAVAJARDIR}/postgresql.jar ;\
 	  ${MKDIR} -m 0755 ${DOCSDIR} ;\
 	  ${INSTALL_DATA} ${WRKSRC}/README \
 			  ${DOCSDIR}/README-jdbc
@@ -45,7 +42,8 @@ do-install:
 .endif
 
 post-install:
-	@ ${SED} "s|%%PREFIX%%|${PREFIX}|g" \
+	@ ${SED} -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
+	  -e "s|%%JAVAJARDIR%%|${JAVAJARDIR}|g" \
 	  < ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@ ${CAT} ${PKGMESSAGE}
 
diff --git a/databases/postgresql-jdbc/pkg-message b/databases/postgresql-jdbc/pkg-message
index fc42b83d60ad..c04f35e32990 100644
--- a/databases/postgresql-jdbc/pkg-message
+++ b/databases/postgresql-jdbc/pkg-message
@@ -1,8 +1,8 @@
 PostgreSQL JDBC support installed!
 
 postgresql.jar resides in
-%%PREFIX%%/share/java/classes/postgresql.jar
+%%JAVAJARDIR%%/postgresql.jar
 Add this to your CLASSPATH!
 
 java examples reside in
-%%PREFIX%%/share/examples/postgresql/jdbc
+%%EXAMPLESDIR%%/jdbc
diff --git a/databases/postgresql-jdbc/pkg-plist b/databases/postgresql-jdbc/pkg-plist
index 74d577eef8f3..e13d99227721 100644
--- a/databases/postgresql-jdbc/pkg-plist
+++ b/databases/postgresql-jdbc/pkg-plist
@@ -16,7 +16,7 @@
 %%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/postgresql-examples.jar
 %%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/psql.java
 %%PORTDOCS%%%%EXAMPLESDIR%%/jdbc/threadsafe.java
-share/java/classes/postgresql.jar
+%%JAVAJARDIR%%/postgresql.jar
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/jdbc/corba
 %%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%%/jdbc 2>/dev/null || true
 %%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true