diff --git a/VERSION b/VERSION
index 15ca9c12..f750a6e2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-21 16:12:40) dev
+Version 2.00.0 (2012-07-23 16:19:51) dev
diff --git a/applications/admin/controllers/openshift.py b/applications/admin/controllers/openshift.py
index 52889b5e..88945f74 100644
--- a/applications/admin/controllers/openshift.py
+++ b/applications/admin/controllers/openshift.py
@@ -34,7 +34,7 @@ def deploy():
         assert repo.bare == False
 
         for i in form.vars.applications:
-            appsrc = os.path.join(os.getcwd(),'applications',i)
+            appsrc = os.path.join(apath(r=request),i)
             appdest = os.path.join(osrepo,'wsgi',osname,'applications',i)
             dir_util.copy_tree(appsrc,appdest)
             #shutil.copytree(appsrc,appdest)
diff --git a/gluon/winservice.py b/gluon/winservice.py
index bbda61ca..d4355111 100644
--- a/gluon/winservice.py
+++ b/gluon/winservice.py
@@ -90,7 +90,7 @@ class Web2pyService(Service):
                 cls = _winreg.QueryValue(h, 'PythonClass')
             finally:
                 _winreg.CloseKey(h)
-            dir = os.path.dirname(cls)
+            dir = os.path.dirname(cls)            
             os.chdir(dir)
             return True
         except:
@@ -149,8 +149,12 @@ class Web2pyService(Service):
 
 def web2py_windows_service_handler(argv=None, opt_file='options'):
     path = os.path.dirname(__file__)
-    classstring = os.path.normpath(os.path.join(up(path),
-                                   'gluon.winservice.Web2pyService'))
+    web2py_path = iup(path)
+    os.chdir(web2py_path)
+    global_settings.gluon_parent = web2py_path
+    custom_import_install(web2py_path)
+    classstring = os.path.normpath(
+        os.path.join(web2py_path,'gluon.winservice.Web2pyService'))
     if opt_file:
         Web2pyService._exe_args_ = opt_file
         win32serviceutil.HandleCommandLine(Web2pyService,
@@ -158,7 +162,6 @@ def web2py_windows_service_handler(argv=None, opt_file='options'):
     win32serviceutil.HandleCommandLine(Web2pyService,
             serviceClassString=classstring, argv=argv)
 
-
 if __name__ == '__main__':
     web2py_windows_service_handler()