diff --git a/models/EXIF.php b/models/EXIF.php
index 1cb567b8..84108a56 100644
--- a/models/EXIF.php
+++ b/models/EXIF.php
@@ -12,6 +12,7 @@ class EXIF
 	public $iso = 0;
 	public $shutter_speed = 0;
 	public $title = '';
+	public $software = '';
 
 	private function __construct(array $meta)
 	{
@@ -35,6 +36,7 @@ class EXIF
 			'iso' => 0,
 			'shutter_speed' => 0,
 			'title' => '',
+			'software' => '',
 		];
 
 		if (!function_exists('exif_read_data'))
@@ -101,6 +103,9 @@ class EXIF
 		elseif (!empty($exif['DateTimeDigitized']))
 			$meta['created_timestamp'] = self::toUnixTime($exif['DateTimeDigitized']);
 
+		if (!empty($exif['Software']))
+			$meta['software'] = $exif['Software'];
+
 		return new self($meta);
 	}
 
diff --git a/templates/PhotoPage.php b/templates/PhotoPage.php
index 800c5218..3ce2b550 100644
--- a/templates/PhotoPage.php
+++ b/templates/PhotoPage.php
@@ -132,6 +132,11 @@ class PhotoPage extends SubTemplate
 						<dt>ISO Speed</dt>
 						<dd>', $this->exif->iso, '</dd>';
 
+		if (!empty($this->exif->software))
+			echo '
+						<dt>Software</dt>
+						<dd>', $this->exif->software, '</dd>';
+
 		echo '
 					</dl>
 				</div>';