diff --git a/controllers/ViewPhoto.php b/controllers/ViewPhoto.php
index 82cb41a7..ab53c0ff 100644
--- a/controllers/ViewPhoto.php
+++ b/controllers/ViewPhoto.php
@@ -98,10 +98,10 @@ class ViewPhoto extends HTMLController
 			$metaData['Shutter Speed'] = $exif->shutterSpeedFraction();
 
 		if (!empty($exif->aperture))
-			$metaData['Aperture'] = number_format($exif->aperture, 1);
+			$metaData['Aperture'] = 'f/' . number_format($exif->aperture, 1);
 
 		if (!empty($exif->focal_length))
-			$metaData['Focal Length'] = $exif->focal_length;
+			$metaData['Focal Length'] = $exif->focal_length . ' mm';
 
 		if (!empty($exif->iso))
 			$metaData['ISO Speed'] = $exif->iso;