diff --git a/umbraco/cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs b/umbraco/cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs
index 686529b963..7143abea94 100644
--- a/umbraco/cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs
+++ b/umbraco/cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs
@@ -102,7 +102,7 @@ namespace umbraco.cms.businesslogic.packager {
                     int outInt = 0;
 
                     //Path checking...
-                    string localPath = IOHelper.MapPath(Settings.PackagesStorage + "/" + pack.Folder);
+                    string localPath = IOHelper.MapPath(IO.SystemDirectories.Media + "/" + pack.Folder);
 
                     if (!System.IO.Directory.Exists(localPath))
                         System.IO.Directory.CreateDirectory(localPath);
@@ -238,7 +238,14 @@ namespace umbraco.cms.businesslogic.packager {
 
 
                     //string packPath = Settings.PackagerRoot.Replace(System.IO.Path.DirectorySeparatorChar.ToString(), "/") + "/" + pack.Name.Replace(' ', '_') + "_" + pack.Version.Replace(' ', '_') + "." + Settings.PackageFileExtension;
-                    string packPath = Settings.PackagerRoot + "/" + (pack.Name + "_" + pack.Version).Replace(' ', '_') + "." + Settings.PackageFileExtension;
+
+                    // check if there's a packages directory below media
+                    string packagesDirectory = IO.SystemDirectories.Media + "/created-packages";
+                    if (!System.IO.Directory.Exists(IOHelper.MapPath(packagesDirectory)))
+                        System.IO.Directory.CreateDirectory(IOHelper.MapPath(packagesDirectory));
+
+
+                    string packPath = packagesDirectory + "/" + (pack.Name + "_" + pack.Version).Replace(' ', '_') + "." + Settings.PackageFileExtension;
                     utill.ZipPackage(localPath, IOHelper.MapPath(packPath));
 
                     pack.PackagePath = packPath;
diff --git a/umbraco/presentation/umbraco/developer/Packages/editPackage.aspx.cs b/umbraco/presentation/umbraco/developer/Packages/editPackage.aspx.cs
index d6989d3431..fc69f385a1 100644
--- a/umbraco/presentation/umbraco/developer/Packages/editPackage.aspx.cs
+++ b/umbraco/presentation/umbraco/developer/Packages/editPackage.aspx.cs
@@ -197,7 +197,7 @@ namespace umbraco.presentation.developer.packages
 
                     if (!string.IsNullOrEmpty(pack.PackagePath)) {
 
-                        packageUmbFile.Text = " &nbsp; <a href='" + pack.PackagePath + "'>Download</a>";
+                        packageUmbFile.Text = " &nbsp; <a href='" + IO.IOHelper.ResolveUrl(pack.PackagePath) + "'>Download</a>";
 
                         this.ClientTools.ShowSpeechBubble(BasePages.BasePage.speechBubbleIcon.success, "Package saved and published", "");
                     } else {