diff --git a/www/dokuwiki-devel/Makefile b/www/dokuwiki-devel/Makefile
index dac5e78a0429..9f6ee91e9db3 100644
--- a/www/dokuwiki-devel/Makefile
+++ b/www/dokuwiki-devel/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	dokuwiki
-PORTVERSION=	20050507
+PORTVERSION=	20050701
 CATEGORIES=	www
 MASTER_SITES=	http://www.splitbrain.org/Programming/PHP/DokuWiki/
-DISTNAME=	${PORTNAME}-2005-05-07
+DISTNAME=	${PORTNAME}-2005-07-01
 EXTRACT_SUFX=	.tgz
 
+# Maintainership available: drop me a line if interested :p
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	A simple and easy to use wiki, no database required
 
@@ -28,7 +29,7 @@ pre-fetch:
 	 @${ECHO_MSG} ""
 .endif
 
-WWWDOCROOT?=	www/data-dist
+WWWDOCROOT?=	www/data
 DOKUWIKIURL?=	${PORTNAME}
 WWWOWN?=	www
 WWWGRP?=	www
@@ -43,7 +44,7 @@ WIKI_LANG?=en
 
 pre-everything::
 .if !defined(WIKI_LANG)
-	@${ECHO_MSG} '*********************************************************'
+	@${ECHO_MSG} '*******************************************************'
 	@${ECHO_MSG} '* You can customize the wiki language by typing	      *'
 	@${ECHO_MSG} '*                                 Use make-flag:      *'
 	@${ECHO_MSG} '*  - Basque			WIKI_LANG=eu	      *'
@@ -55,20 +56,24 @@ pre-everything::
 	@${ECHO_MSG} '*  - Dutch			WIKI_LANG=nl	      *'
 	@${ECHO_MSG} '*  - English			WIKI_LANG=en	      *'
 	@${ECHO_MSG} '*  - Esperanto			WIKI_LANG=eo	      *'
-#	@${ECHO_MSG} '*  - Estonian			WIKI_LANG=et	      *'
+	@${ECHO_MSG} '*  - Estonian			WIKI_LANG=et	      *'
 	@${ECHO_MSG} '*  - Finnish			WIKI_LANG=fi          *'
 	@${ECHO_MSG} '*  - French			WIKI_LANG=fr	      *'
 	@${ECHO_MSG} '*  - German			WIKI_LANG=de	      *'
 	@${ECHO_MSG} '*  - Hebrew			WIKI_LANG=he	      *'
 	@${ECHO_MSG} '*  - Hungarian			WIKI_LANG=hu	      *'
 	@${ECHO_MSG} '*  - Italian			WIKI_LANG=it	      *'
+	@${ECHO_MSG} '*  - Japanese			WIKI_LANG=ja	      *'
 	@${ECHO_MSG} '*  - Korean			WIKI_LANG=ko	      *'
+	@${ECHO_MSG} '*  - Latvian			WIKI_LANG=lv	      *'
+	@${ECHO_MSG} '*  - Lithuanian			WIKI_LANG=lt	      *'
 	@${ECHO_MSG} '*  - Norwegian			WIKI_LANG=no	      *'
 	@${ECHO_MSG} '*  - Polish			WIKI_LANG=pl	      *'
 	@${ECHO_MSG} '*  - Portuguese			WIKI_LANG=pt	      *'
 	@${ECHO_MSG} '*  - Romanian			WIKI_LANG=ro	      *'
 	@${ECHO_MSG} '*  - Russian			WIKI_LANG=ru	      *'
 	@${ECHO_MSG} '*  - Spanish			WIKI_LANG=es	      *'
+	@${ECHO_MSG} '*  - Slovenian			WIKI_LANG=sl	      *'
 	@${ECHO_MSG} '*  - Swedish			WIKI_LANG=sv	      *'
 	@${ECHO_MSG} '*  - Vietnamese			WIKI_LANG=vi	      *'
 	@${ECHO_MSG} '*					              *'
@@ -83,15 +88,15 @@ pre-patch:
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|sfs|bbs|g' ${WRKSRC}/lang/zh-tw/edit.txt
-	${FIND} ${WRKSRC}/lang/zh-tw -name "*.txt.bak" -delete
+	@${REINPLACE_CMD} -e 's|sfs|bbs|g' ${WRKSRC}/inc/lang/zh-tw/edit.txt
+	${FIND} ${WRKSRC}/inc/lang/zh-tw -name "*.txt.bak" -delete
 
 pre-install:
-	cd ${WRKSRC} && ${FIND} -s . -type f | \
+	${TOUCH} ${WRKSRC}/data/changes.log
+	@cd ${WRKSRC} && ${FIND} -s . -type f | \
 		${SED} -e 's|^./||;s|^|${DOKUWIKIDIR}/|' > ${PLIST} \
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm ${DOKUWIKIDIR}/|' >> ${PLIST} \
-		&& ${ECHO_CMD} ${DOKUWIKIDIR}/changes.log >> ${PLIST} \
 		&& ${ECHO_CMD} "@unexec rmdir %D/${DOKUWIKIDIR} 2>/dev/null || true">> ${PLIST}
 
 do-install:
@@ -101,11 +106,7 @@ do-install:
 	@${CHMOD} 755 ${PREFIX}/${DOKUWIKIDIR}
 	@${CP} -R ${WRKSRC}/ ${PREFIX}/${DOKUWIKIDIR}
 	# Setup the correct permissions
-	@${TOUCH} ${PREFIX}/${DOKUWIKIDIR}/changes.log
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKIDIR}/changes.log
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKIDIR}/data
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKIDIR}/media
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKIDIR}/attic
 
 post-install:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
diff --git a/www/dokuwiki-devel/distinfo b/www/dokuwiki-devel/distinfo
index 494bb17907da..833cf44b1712 100644
--- a/www/dokuwiki-devel/distinfo
+++ b/www/dokuwiki-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (dokuwiki-2005-05-07.tgz) = 03c4c26376250fdc8a755d8e8232c778
-SIZE (dokuwiki-2005-05-07.tgz) = 439671
+MD5 (dokuwiki-2005-07-01.tgz) = 6fecdc30ef3d5927c6bae1ed8713df13
+SIZE (dokuwiki-2005-07-01.tgz) = 496153
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile
index dac5e78a0429..9f6ee91e9db3 100644
--- a/www/dokuwiki/Makefile
+++ b/www/dokuwiki/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	dokuwiki
-PORTVERSION=	20050507
+PORTVERSION=	20050701
 CATEGORIES=	www
 MASTER_SITES=	http://www.splitbrain.org/Programming/PHP/DokuWiki/
-DISTNAME=	${PORTNAME}-2005-05-07
+DISTNAME=	${PORTNAME}-2005-07-01
 EXTRACT_SUFX=	.tgz
 
+# Maintainership available: drop me a line if interested :p
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	A simple and easy to use wiki, no database required
 
@@ -28,7 +29,7 @@ pre-fetch:
 	 @${ECHO_MSG} ""
 .endif
 
-WWWDOCROOT?=	www/data-dist
+WWWDOCROOT?=	www/data
 DOKUWIKIURL?=	${PORTNAME}
 WWWOWN?=	www
 WWWGRP?=	www
@@ -43,7 +44,7 @@ WIKI_LANG?=en
 
 pre-everything::
 .if !defined(WIKI_LANG)
-	@${ECHO_MSG} '*********************************************************'
+	@${ECHO_MSG} '*******************************************************'
 	@${ECHO_MSG} '* You can customize the wiki language by typing	      *'
 	@${ECHO_MSG} '*                                 Use make-flag:      *'
 	@${ECHO_MSG} '*  - Basque			WIKI_LANG=eu	      *'
@@ -55,20 +56,24 @@ pre-everything::
 	@${ECHO_MSG} '*  - Dutch			WIKI_LANG=nl	      *'
 	@${ECHO_MSG} '*  - English			WIKI_LANG=en	      *'
 	@${ECHO_MSG} '*  - Esperanto			WIKI_LANG=eo	      *'
-#	@${ECHO_MSG} '*  - Estonian			WIKI_LANG=et	      *'
+	@${ECHO_MSG} '*  - Estonian			WIKI_LANG=et	      *'
 	@${ECHO_MSG} '*  - Finnish			WIKI_LANG=fi          *'
 	@${ECHO_MSG} '*  - French			WIKI_LANG=fr	      *'
 	@${ECHO_MSG} '*  - German			WIKI_LANG=de	      *'
 	@${ECHO_MSG} '*  - Hebrew			WIKI_LANG=he	      *'
 	@${ECHO_MSG} '*  - Hungarian			WIKI_LANG=hu	      *'
 	@${ECHO_MSG} '*  - Italian			WIKI_LANG=it	      *'
+	@${ECHO_MSG} '*  - Japanese			WIKI_LANG=ja	      *'
 	@${ECHO_MSG} '*  - Korean			WIKI_LANG=ko	      *'
+	@${ECHO_MSG} '*  - Latvian			WIKI_LANG=lv	      *'
+	@${ECHO_MSG} '*  - Lithuanian			WIKI_LANG=lt	      *'
 	@${ECHO_MSG} '*  - Norwegian			WIKI_LANG=no	      *'
 	@${ECHO_MSG} '*  - Polish			WIKI_LANG=pl	      *'
 	@${ECHO_MSG} '*  - Portuguese			WIKI_LANG=pt	      *'
 	@${ECHO_MSG} '*  - Romanian			WIKI_LANG=ro	      *'
 	@${ECHO_MSG} '*  - Russian			WIKI_LANG=ru	      *'
 	@${ECHO_MSG} '*  - Spanish			WIKI_LANG=es	      *'
+	@${ECHO_MSG} '*  - Slovenian			WIKI_LANG=sl	      *'
 	@${ECHO_MSG} '*  - Swedish			WIKI_LANG=sv	      *'
 	@${ECHO_MSG} '*  - Vietnamese			WIKI_LANG=vi	      *'
 	@${ECHO_MSG} '*					              *'
@@ -83,15 +88,15 @@ pre-patch:
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|sfs|bbs|g' ${WRKSRC}/lang/zh-tw/edit.txt
-	${FIND} ${WRKSRC}/lang/zh-tw -name "*.txt.bak" -delete
+	@${REINPLACE_CMD} -e 's|sfs|bbs|g' ${WRKSRC}/inc/lang/zh-tw/edit.txt
+	${FIND} ${WRKSRC}/inc/lang/zh-tw -name "*.txt.bak" -delete
 
 pre-install:
-	cd ${WRKSRC} && ${FIND} -s . -type f | \
+	${TOUCH} ${WRKSRC}/data/changes.log
+	@cd ${WRKSRC} && ${FIND} -s . -type f | \
 		${SED} -e 's|^./||;s|^|${DOKUWIKIDIR}/|' > ${PLIST} \
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm ${DOKUWIKIDIR}/|' >> ${PLIST} \
-		&& ${ECHO_CMD} ${DOKUWIKIDIR}/changes.log >> ${PLIST} \
 		&& ${ECHO_CMD} "@unexec rmdir %D/${DOKUWIKIDIR} 2>/dev/null || true">> ${PLIST}
 
 do-install:
@@ -101,11 +106,7 @@ do-install:
 	@${CHMOD} 755 ${PREFIX}/${DOKUWIKIDIR}
 	@${CP} -R ${WRKSRC}/ ${PREFIX}/${DOKUWIKIDIR}
 	# Setup the correct permissions
-	@${TOUCH} ${PREFIX}/${DOKUWIKIDIR}/changes.log
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKIDIR}/changes.log
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKIDIR}/data
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKIDIR}/media
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${DOKUWIKIDIR}/attic
 
 post-install:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
diff --git a/www/dokuwiki/distinfo b/www/dokuwiki/distinfo
index 494bb17907da..833cf44b1712 100644
--- a/www/dokuwiki/distinfo
+++ b/www/dokuwiki/distinfo
@@ -1,2 +1,2 @@
-MD5 (dokuwiki-2005-05-07.tgz) = 03c4c26376250fdc8a755d8e8232c778
-SIZE (dokuwiki-2005-05-07.tgz) = 439671
+MD5 (dokuwiki-2005-07-01.tgz) = 6fecdc30ef3d5927c6bae1ed8713df13
+SIZE (dokuwiki-2005-07-01.tgz) = 496153