diff --git a/www/zope-FileSystemSite/Makefile b/www/zope-FileSystemSite/Makefile
index 51ba67a6884a..34b04b623afa 100644
--- a/www/zope-FileSystemSite/Makefile
+++ b/www/zope-FileSystemSite/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	FileSystemSite
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	www zope
-MASTER_SITES=	http://www.zope.org/Members/k_vertigo/Products/FileSystemSite/default/
+MASTER_SITES=	http://zope.org/Members/philikon/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	zope-
-DISTNAME=	FileSystemSite-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	x@Vex.Net
diff --git a/www/zope-FileSystemSite/distinfo b/www/zope-FileSystemSite/distinfo
index bde912a4b22c..41379ce6d244 100644
--- a/www/zope-FileSystemSite/distinfo
+++ b/www/zope-FileSystemSite/distinfo
@@ -1 +1 @@
-MD5 (zope/FileSystemSite-1.2.tgz) = dbbc6538957d9fa307bd43ab556ac1b2
+MD5 (zope/FileSystemSite-1.3.tgz) = 00b258f829c018bb883ca19d4ab193ef
diff --git a/www/zope-FileSystemSite/pkg-descr b/www/zope-FileSystemSite/pkg-descr
index ccfce926fe6b..a9e2524e0db3 100644
--- a/www/zope-FileSystemSite/pkg-descr
+++ b/www/zope-FileSystemSite/pkg-descr
@@ -5,4 +5,4 @@ The major use of this is to develop view code on the file system such that it
 can be edited with normal development utilties and checked into a source
 control management system.
 
-WWW: http://www.zope.org/Members/k_vertigo/Products/FileSystemSite
+WWW: http://www.zope.org/Members/philikon/FileSystemSite
diff --git a/www/zope-FileSystemSite/pkg-plist b/www/zope-FileSystemSite/pkg-plist
index 5a8d7abb3e86..c20262536bec 100644
--- a/www/zope-FileSystemSite/pkg-plist
+++ b/www/zope-FileSystemSite/pkg-plist
@@ -11,8 +11,12 @@
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/FSDTMLMethod.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/FSExternalMethod.py
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/FSExternalMethod.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/FSFile.py
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/FSFile.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/FSImage.py
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/FSImage.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/FSMetadata.py
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/FSMetadata.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/FSObject.py
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/FSObject.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/FSPageTemplate.py
@@ -32,6 +36,7 @@
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/dtml/addFSDirView.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/dtml/custdtml.dtml
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/dtml/custfile.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/dtml/custimage.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/dtml/custprops.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/dtml/custpt.dtml
@@ -42,6 +47,7 @@
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/images/cookie.gif
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/images/dirview.gif
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/images/fsdtml.gif
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/images/fsfile.gif
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/images/fsimage.gif
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/images/fsprops.gif
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/images/fspt.gif
@@ -51,23 +57,46 @@
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/templates/dtml
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/templates/script
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/templates/zsql
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base/content.py
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base/content.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base/dummy.py
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base/dummy.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base/security.py
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base/security.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base/testcase.py
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base/testcase.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base/tidata.py
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base/tidata.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base/utils.py
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base/utils.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/test_FSFile.py
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/test_FSFile.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/test_FSImage.py
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/test_FSImage.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/test_FSMetadata.py
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/test_FSMetadata.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/test_FSPageTemplate.py
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/test_FSPageTemplate.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/test_FSPythonScript.py
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/test_FSPythonScript.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/test_FSSecurity.py
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/test_FSSecurity.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/test_all.py
+%%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/test_all.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/utils.py
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/utils.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/version.txt
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/templates
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/images
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/dtml
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/Extensions
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/EditorUtils
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/ExampleSite/site
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/ExampleSite
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/EditorUtils
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/Extensions
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/dtml
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/images
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/templates
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests/base
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite/tests
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/FileSystemSite