diff --git a/deploy.py b/deploy.py
index 0f9a01db3fb0cc40cf0e2e10d266845fb4d55850..43b998050fa23bee1b485d7f1e812541191b49de 100755
--- a/deploy.py
+++ b/deploy.py
@@ -92,14 +92,14 @@ if __name__ == "__main__":
     ## Create our install prefix if needed and ensure it is writable
     args.prefix = os.path.abspath(args.prefix)
     if not args.module_path:
-        args.module_path = '{}/etc/modulefiles'.format(args.prefix)
+        args.module_path = os.path.abspath('{}/../../etc/modulefiles'.format(args.prefix))
     print('Install prefix:', args.prefix)
     print('Creating install prefix if needed...')
     bindir = '{}/bin'.format(args.prefix)
     libdir = '{}/lib'.format(args.prefix)
     libexecdir = '{}/libexec'.format(args.prefix)
     root_prefix = os.path.abspath('{}/..'.format(args.prefix))
-    moduledir = '{}/etc/modulefiles/{}'.format(root_prefix, PROJECT_NAME)
+    moduledir = '{}/{}'.format(args.module_path, PROJECT_NAME)
     for dir in [bindir, libdir, libexecdir, moduledir]:
         print(' -', dir)
         smart_mkdir(dir)