diff --git a/server/templates/server/machine_detail.html b/server/templates/server/machine_detail.html
index f1aec13..2e1e26d 100644
--- a/server/templates/server/machine_detail.html
+++ b/server/templates/server/machine_detail.html
@@ -51,6 +51,10 @@ <h3>Machine</h3>
           <th>Serial:</th>
           <td>{{ machine.serial }}</td>
         </tr>
+        <tr>
+          <th>LAN IP Address:</th>
+          <td>{{ ip_address }}</td>
+        </tr>
         {% if 'MachineInfo' in report %}
         <tr>
           <th>Hostname:</th>
diff --git a/server/views.py b/server/views.py
index 62d9a4f..5bbce60 100644
--- a/server/views.py
+++ b/server/views.py
@@ -423,6 +423,12 @@ def machine_detail(request, machine_id):
                 conditions = conditions.exclude(condition_name=excluded)
     else:
         conditions = None
+    
+    # get the IP address(es) from the condition
+    ip_address = conditions.get(machine=machine, condition_name__exact='ipv4_address')
+    ip_address = ip_address.condition_data
+    print ip_address
+    
     install_results = {}
     for result in report.get('InstallResults', []):
         nameAndVers = result['name'] + '-' + result['version']
@@ -475,7 +481,7 @@ def machine_detail(request, machine_id):
     if 'managed_uninstalls_list' in report:
         report['managed_uninstalls_list'].sort()
     
-    c = {'user':user, 'machine_group': machine_group, 'business_unit': business_unit, 'report': report, 'install_results': install_results, 'removal_results': removal_results, 'machine': machine, 'facts':facts, 'conditions':conditions }
+    c = {'user':user, 'machine_group': machine_group, 'business_unit': business_unit, 'report': report, 'install_results': install_results, 'removal_results': removal_results, 'machine': machine, 'facts':facts, 'conditions':conditions, 'ip_address':ip_address }
     return render_to_response('server/machine_detail.html', c, context_instance=RequestContext(request))
 
 # checkin