diff --git a/zephyr/lib/upload.py b/zephyr/lib/upload.py
index e183e82141..c9636e5154 100644
--- a/zephyr/lib/upload.py
+++ b/zephyr/lib/upload.py
@@ -52,9 +52,8 @@ def upload_image_to_s3(
     else:
         headers = None
 
-    key.set_contents_from_filename(
-            user_file.temporary_file_path(),
-            headers=headers)
+    contents = user_file.read()
+    key.set_contents_from_string(contents, headers=headers)
 
 def get_file_info(request, user_file):
     uploaded_file_name = user_file.name
diff --git a/zephyr/management/commands/gravatar_to_user_avatar.py b/zephyr/management/commands/gravatar_to_user_avatar.py
new file mode 100644
index 0000000000..417f3d9537
--- /dev/null
+++ b/zephyr/management/commands/gravatar_to_user_avatar.py
@@ -0,0 +1,47 @@
+from __future__ import absolute_import
+
+import sys
+import requests
+from zephyr.models import get_user_profile_by_email, UserProfile
+from zephyr.lib.avatar import gravatar_hash, user_avatar_hash
+from zephyr.lib.upload import upload_avatar_image
+from django.core.management.base import BaseCommand, CommandError
+from django.core.files.uploadedfile import SimpleUploadedFile
+
+class Command(BaseCommand):
+    help = """Migrate the specified user's Gravatar over to an avatar that we serve.  If two
+email addresses are specified, use the Gravatar for the first and upload the image
+for both email addresses."""
+
+    def handle(self, *args, **kwargs):
+        if len(args) == 0:
+            raise CommandError("You must specify a user")
+        if len(args) > 2:
+            raise CommandError("Too many positional arguments")
+
+        old_email = args[0]
+
+        if len(args) == 2:
+            new_email = args[1]
+        elif len(args) == 1:
+            new_email = old_email
+
+        gravatar_url = "https://secure.gravatar.com/avatar/%s?d=identicon" % (gravatar_hash(old_email),)
+        gravatar_data = requests.get(gravatar_url).content
+        gravatar_file = SimpleUploadedFile('gravatar.jpg', gravatar_data, 'image/jpeg')
+
+        try:
+            user_profile = get_user_profile_by_email(old_email)
+        except UserProfile.DoesNotExist:
+            try:
+                user_profile = get_user_profile_by_email(new_email)
+            except UserProfile.DoesNotExist:
+                raise CommandError("Could not find specified user")
+
+        upload_avatar_image(gravatar_file, user_profile, old_email)
+        if old_email != new_email:
+            gravatar_file.seek(0)
+            upload_avatar_image(gravatar_file, user_profile, new_email)
+
+        user_profile.avatar_source = UserProfile.AVATAR_FROM_USER
+        user_profile.save(update_fields=['avatar_source'])