diff --git a/commons/src/main/java/org/wikimedia/commons/StartUploadTask.java b/commons/src/main/java/org/wikimedia/commons/StartUploadTask.java
index 4bf2b6bfe..eb53b9b64 100644
--- a/commons/src/main/java/org/wikimedia/commons/StartUploadTask.java
+++ b/commons/src/main/java/org/wikimedia/commons/StartUploadTask.java
@@ -31,6 +31,10 @@ public class StartUploadTask extends AsyncTask<Void, Void, Contribution> {
 
         String title = rawTitle;
         String extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType);
+        // People are used to ".jpg" more than ".jpeg" which the system gives us.
+        if (extension != null && extension.toLowerCase().equals("jpeg")) {
+            extension = "jpg";
+        }
         if(extension != null && !title.toLowerCase().endsWith(extension.toLowerCase())) {
             title += "." + extension;
         }