diff -ruN /usr/ports/www/gaeo/Makefile gaeo/Makefile
--- /usr/ports/www/gaeo/Makefile	2010-02-06 05:12:34.000000000 +0800
+++ gaeo/Makefile	2010-11-16 12:05:38.000000000 +0800
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gaeo
-PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTVERSION=	0.3
 PORTEPOCH=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
@@ -26,10 +25,7 @@
 
 GAEOHOME=	${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}
 
-PORTDOCS=	LICENSE NOTICE README.TXT
-
-post-patch:
-	${REINPLACE_CMD} -e "s,%%GAEOHOME%%,${GAEOHOME},g" ${WRKSRC}/bin/gaeo.py
+PORTDOCS=	LICENSE NOTICE README.TXT CHANGELOG
 
 post-install:
 .if !defined(NOPORTDOCS)
diff -ruN /usr/ports/www/gaeo/distinfo gaeo/distinfo
--- /usr/ports/www/gaeo/distinfo	2009-05-24 05:16:58.000000000 +0800
+++ gaeo/distinfo	2010-11-16 11:39:28.000000000 +0800
@@ -1,3 +1,2 @@
-MD5 (gaeo-0.2.1.zip) = 2a70c66ca5e31740a6fc01d3f549db28
-SHA256 (gaeo-0.2.1.zip) = 29e6f0bc983bc53de6474d0560f1b48249ef0e9c5cf1d45f23de7ba133cb12d7
-SIZE (gaeo-0.2.1.zip) = 50012
+SHA256 (gaeo-0.3.zip) = 3b4d0a0c618fe4ded3333568d0d8a576641310fc4985ec82eeceda7cb7fb1afa
+SIZE (gaeo-0.3.zip) = 40641
diff -ruN /usr/ports/www/gaeo/files/patch-bin_gaeo.py gaeo/files/patch-bin_gaeo.py
--- /usr/ports/www/gaeo/files/patch-bin_gaeo.py	2009-02-04 13:37:15.000000000 +0800
+++ gaeo/files/patch-bin_gaeo.py	1970-01-01 08:00:00.000000000 +0800
@@ -1,24 +0,0 @@
---- bin/gaeo.py.orig	2008-12-03 01:05:19.000000000 +0800
-+++ bin/gaeo.py	2008-12-18 00:52:37.000000000 +0800
-@@ -212,7 +212,7 @@
- 
-     # copy GAEO directory
-     gaeo_folder = os.path.join(project_home, 'gaeo')
--    copytree(os.path.join(os.path.dirname(os.path.dirname(__file__)), template_base, 'gaeo'), gaeo_folder)
-+    copytree(os.path.join('%%GAEOHOME%%', template_base, 'gaeo'), gaeo_folder)
-     
-     # if zipped option is enabled
-     if zipped_core:
-@@ -231,10 +231,10 @@
-         os.chdir(os.path.join(project_home, '..'))
-     
-     # copy plugins directory
--    copytree(os.path.join(os.path.dirname(os.path.dirname(__file__)), template_base, 'plugins'), os.path.join(project_home, 'plugins'))
-+    copytree(os.path.join('%%GAEOHOME%%', template_base, 'plugins'), os.path.join(project_home, 'plugins'))
- 
-     # copy sample main.py
--    copyfile(os.path.join(os.path.dirname(os.path.dirname(__file__)), template_base, 'main-sample.py'), os.path.join(project_home, 'main.py'))
-+    copyfile(os.path.join('%%GAEOHOME%%', template_base, 'main-sample.py'), os.path.join(project_home, 'main.py'))
- 
-     # create the eclipse project file
-     if create_eclipse_proj:
diff -ruN /usr/ports/www/gaeo/pkg-plist gaeo/pkg-plist
--- /usr/ports/www/gaeo/pkg-plist	2009-02-04 13:37:15.000000000 +0800
+++ gaeo/pkg-plist	2010-11-16 11:51:18.000000000 +0800
@@ -33,9 +33,6 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/helper.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/helper.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/helper.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/jsonencoder.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/jsonencoder.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/controller/jsonencoder.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/dispatch/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/dispatch/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/dispatch/__init__.pyo
@@ -51,6 +48,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/datastore.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/datastore.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/datastore.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/memcache.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/memcache.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session/memcache.pyo
@@ -66,6 +66,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/helper/form.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/helper/form.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/helper/form.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/libs/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/libs/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/libs/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/main-sample.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/main-sample.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/main-sample.pyo
@@ -73,6 +76,7 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/plugins/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/plugins/__init__.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/plugins
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/libs
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view/helper
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/view
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/oildrum/gaeo/session