diff --git a/package_release.py b/package_release.py
index c80c9bc2daefc2f6b2b7b252353512cc09f3ec47..338781e81d63a751e89b3d6537ebd1014cfd3ec3 100755
--- a/package_release.py
+++ b/package_release.py
@@ -108,9 +108,9 @@ def main():
     # Get bitbake variables from testdata.json file
     testdata_files = []
     if args.images_dir is not None:
-        testdata_files += glob.glob(args.images_dir + "/*.testdata.json")
+        testdata_files += glob.glob(os.path.join(args.images_dir, "*.testdata.json"))
     if args.sdk_dir is not None:
-        testdata_files += glob.glob(args.sdk_dir + "/*.testdata.json")
+        testdata_files += glob.glob(os.path.join(args.sdk_dir, "*.testdata.json"))
 
     # Debug stuff
     if not testdata_files:
@@ -156,7 +156,7 @@ def main():
         outlocal_dir = None
 
     if args.doc_dir is not None:
-        doc_files = glob.glob(args.doc_dir + "/*.md")
+        doc_files = glob.glob(os.path.join(args.doc_dir, "*.md"))
         copy_files(doc_files, "", "", output_dir, outlocal_dir)
 
     if args.images_dir is not None:
@@ -169,9 +169,15 @@ def main():
 
     # Handle SDK if available
     if args.sdk_dir is not None:
-        sdkfiles = glob.glob(args.sdk_dir + sdkname + "*")
+        sdkfiles = glob.glob(os.path.join(args.sdk_dir, sdkname + "*"))
         copy_files(sdkfiles, "", os.path.join(machine, "sdk"), None, outlocal_dir)
 
+    # Store pathes and other stuff in environment variable file
+    with open("package.env", "w") as env_file:
+        env_file.write("VERSION={}\n".format(version))
+        env_file.write("MACHINE={}\n".format(machine))
+        env_file.write("LOCALDIR={}\n".format(outlocal_dir))
+
 
 if __name__ == "__main__":
     main()