diff --git a/lib/up-storage.js b/lib/up-storage.js
index 05c05b157..897b44b79 100644
--- a/lib/up-storage.js
+++ b/lib/up-storage.js
@@ -8,7 +8,7 @@ var Logger         = require('./logger')
 var MyStreams      = require('./streams')
 var Utils          = require('./utils')
 var encode         = function(thing) {
-  return thing.replace('/', '%2f');
+  return encodeURIComponent(thing).replace(/^%40/, '@');
 };
 
 module.exports = Storage