diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56ae42f38..eceac3891 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
     * Fixed saving of `external` page types [admin #789](https://github.com/getgrav/grav-plugin-admin/issues/789)
     * Fixed issue deleting parent folder of folder with `param_sep` in the folder name [admin #796](https://github.com/getgrav/grav-plugin-admin/issues/796)
     * Fixed an issue with streams in `bin/plugin`
+    * Fixed `jpeg` file format support in Media
 
 # v1.1.5
 ## 09/09/2016
diff --git a/system/config/media.yaml b/system/config/media.yaml
index f33e1ea45..e0688b1a4 100644
--- a/system/config/media.yaml
+++ b/system/config/media.yaml
@@ -12,7 +12,7 @@ types:
     type: image
     thumb: media/thumb-jpg.png
     mime: image/jpeg
-  jpe:
+  jpeg:
     type: image
     thumb: media/thumb-jpg.png
     mime: image/jpeg