diff --git a/Netdisco/Changes b/Netdisco/Changes
index 85db21c8..890b5e65 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,5 +1,9 @@
 2.033005
 
+  [NEW FEATURES]
+
+  * Login Logo image can be configured to appear alongisde the Log In form
+
   [BUG FIXES]
 
   * [#255] undefined host error in netdisco-do psql
diff --git a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
index b5ff07f1..37bc4818 100644
--- a/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
+++ b/Netdisco/lib/App/Netdisco/Manual/Configuration.pod
@@ -452,6 +452,13 @@ When showing Device Ports, Netdisco calculates first an average number of
 VLANs across all device ports. If this is above this configurable threshold,
 the VLAN Membership is I<not> shown (regardless of Display Columns setting.
 
+=head3 C<login_logo>
+
+Value: String. Default: none.
+
+Set to the URL of an image file which will be displayed alongside the C<Log
+In> form.
+
 =head2 Netdisco Core
 
 =head3 C<mibhome>
diff --git a/Netdisco/share/views/index.tt b/Netdisco/share/views/index.tt
index 7e7fa0c9..3627378c 100644
--- a/Netdisco/share/views/index.tt
+++ b/Netdisco/share/views/index.tt
@@ -41,6 +41,9 @@
             <input id='loginuser' placeholder="Username" class="span2" name="username" type="text" required="required"/>
             <input placeholder="Password" class="span2" name="password" type="password" required="required"/>
             <button type="submit" class="btn btn-info">Log In</button>
+            [% IF settings.login_logo %]
+            <img src="[% settings.login_logo %]" alt="Login Logo" />
+            [% END %]
           </div>
           [% IF params.return_url %]
           <input type="hidden" name="return_url" value="[% params.return_url | html_entity %]"/>