diff --git a/lib/builder.js b/lib/builder.js
index 5212710..ec32367 100644
--- a/lib/builder.js
+++ b/lib/builder.js
@@ -595,8 +595,9 @@ function processOutputOpts(options, defaults) {
   extend(opts, options);
 
   opts.uglify = opts.uglify || {};
+  opts.uglify.output   = opts.uglify.output || {};  
   opts.uglify.compress = opts.uglify.compress || {};
-  opts.uglify.beautify = opts.uglify.beautify || {};
+  opts.uglify.beautify = opts.uglify.beautify || opts.uglify.output;
 
   // NB deprecated these for uglify directly
   if (opts.globalDefs && !('global_defs' in opts.uglify.compress))
diff --git a/package.json b/package.json
index 15aad0e..aeac39d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "systemjs-builder",
-  "version": "0.15.35",
+  "version": "0.15.36",
   "description": "SystemJS Build Tool",
   "main": "index.js",
   "dependencies": {
@@ -18,7 +18,7 @@
     "source-map": "^0.5.3",
     "systemjs": "^0.19.43",
     "traceur": "0.0.105",
-    "uglify-js": "^2.6.1"
+    "uglify-js": "~2.7.5"
   },
   "devDependencies": {
     "babel": "^5.8.38",