diff --git a/Makefile b/Makefile
index f1020b43..a57ce0bb 100644
--- a/Makefile
+++ b/Makefile
@@ -73,12 +73,9 @@ app:
 	cp LICENSE ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp VERSION ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp CHANGELOG ../web2py_osx/web2py/web2py.app/Contents/Resources
-	cp splashlogo.gif ../web2py_osx/web2py/web2py.app/Contents/Resources
-	cp options_std.py ../web2py_osx/web2py/web2py.app/Contents/Resources
-	cp routes.example.py ../web2py_osx/web2py/web2py.app/Contents/Resources
-	cp router.example.py ../web2py_osx/web2py/web2py.app/Contents/Resources
-	cp app.example.yaml ../web2py_osx/web2py/web2py.app/Contents/Resources
-	cp queue.example.yaml ../web2py_osx/web2py/web2py.app/Contents/Resources
+	cp -r extras ../web2py_osx/web2py/web2py.app/Contents/Resources
+	cp -r examples ../web2py_osx/web2py/web2py.app/Contents/Resources
+	cp -r handlers ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp -r applications/admin ../web2py_osx/web2py/web2py.app/Contents/Resources/applications
 	cp -r applications/welcome ../web2py_osx/web2py/web2py.app/Contents/Resources/applications
 	cp -r applications/examples ../web2py_osx/web2py/web2py.app/Contents/Resources/applications
@@ -96,12 +93,9 @@ win:
 	cp LICENSE ../web2py_win/web2py/
 	cp VERSION ../web2py_win/web2py/
 	cp CHANGELOG ../web2py_win/web2py/
-	cp splashlogo.gif ../web2py_win/web2py/
-	cp options_std.py ../web2py_win/web2py/
-	cp routes.example.py ../web2py_win/web2py/
-	cp router.example.py ../web2py_win/web2py/
-	cp app.example.yaml ../web2py_win/web2py/
-	cp queue.example.yaml ../web2py_win/web2py/
+	cp -R extras ../web2py_win/web2py/
+	cp -R examples ../web2py_win/web2py/
+	cp -R handlers ../web2py_win/web2py/
 	cp -R applications/admin ../web2py_win/web2py/applications
 	cp -R applications/welcome ../web2py_win/web2py/applications
 	cp -R applications/examples ../web2py_win/web2py/applications
diff --git a/VERSION b/VERSION
index 05051e86..48092ab9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.09.06.15.37.07
+Version 2.6.0-development+timestamp.2013.09.06.16.18.23