diff --git a/Makefile b/Makefile
index 1775b76d..844548ac 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ app:
 	#find gluon -path '*.pyc' -exec cp {} ../web2py_osx/site-packages/{} \;
 	#cd ../web2py_osx/site-packages/; zip -r ../site-packages.zip *
 	#mv ../web2py_osx/site-packages.zip ../web2py_osx/web2py/web2py.app/Contents/Resources/lib/python2.7
-	find gluon -path '*.py' -exec cp {} ../web2py_osx/web2py/web2py.app/Contents/Resources/{} \;	
+	find gluon -path '*.py' -exec cp -R {} ../web2py_osx/web2py/web2py.app/Contents/Resources/{} \;	
 	cp README.markdown ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp NEWINSTALL ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp LICENSE ../web2py_osx/web2py/web2py.app/Contents/Resources
@@ -88,7 +88,7 @@ app:
 win:
 	python2.7 -c 'import compileall; compileall.compile_dir("gluon/")'
 	#cd ../web2py_win/library/; unzip ../library.zip
-	find gluon -path '*.pyc' -exec cp {} ../web2py_win/library/{} \;
+	find gluon -path '*.pyc' -exec cp -R {} ../web2py_win/library/{} \;
 	cd ../web2py_win/library/; zip -r ../library.zip *
 	mv ../web2py_win/library.zip ../web2py_win/web2py
 	cp README.markdown ../web2py_win/web2py/
@@ -102,9 +102,9 @@ win:
 	cp router.example.py ../web2py_win/web2py/
 	cp app.example.yaml ../web2py_win/web2py/
 	cp queue.example.yaml ../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
+	cp -R applications/admin ../web2py_win/web2py/applications
+	cp -R applications/welcome ../web2py_win/web2py/applications
+	cp -R applications/examples ../web2py_win/web2py/applications
 	cp applications/__init__.py ../web2py_win/web2py/applications
 	cd ../web2py_win; zip -r web2py_win.zip web2py
 	mv ../web2py_win/web2py_win.zip .
diff --git a/VERSION b/VERSION
index 1b61e86f..1ebc80dd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.5.1-stable+timestamp.2013.06.06.10.35.58
+Version 2.5.1-stable+timestamp.2013.06.06.10.51.00