diff --git a/mirrors/management/commands/mirrorresolv.py b/mirrors/management/commands/mirrorresolv.py
index e69de29..140a044 100644
--- a/mirrors/management/commands/mirrorresolv.py
+++ b/mirrors/management/commands/mirrorresolv.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+"""
+mirrorresolv command
+
+Usage: ./manage.py mirrorresolv
+"""
+
+from django.core.management.base import NoArgsCommand
+from mirrors.models import MirrorUrl
+
+from urlparse import urlparse
+import socket
+
+class Command(NoArgsCommand):
+    help = "Runs a check on all active mirror URLs to determine if they are reachable via IPv4 and/or v6."
+
+    def handle_noargs(self, **options):
+        for mirrorurl in MirrorUrl.objects.filter(mirror__active=True):
+            families = [x[0] for x in socket.getaddrinfo(
+                    urlparse(mirrorurl.url).hostname, None)]
+            mirrorurl.has_ipv4 = socket.AF_INET in families
+            mirrorurl.has_ipv6 = socket.AF_INET6 in families
+            mirrorurl.save()
+
+# vim: set ts=4 sw=4 et:
diff --git a/mirrors/migrations/0006_auto__add_field_mirrorurl_has_ipv4__add_field_mirrorurl_has_ipv6.py b/mirrors/migrations/0006_auto__add_field_mirrorurl_has_ipv4__add_field_mirrorurl_has_ipv6.py
index e69de29..966c266 100644
--- a/mirrors/migrations/0006_auto__add_field_mirrorurl_has_ipv4__add_field_mirrorurl_has_ipv6.py
+++ b/mirrors/migrations/0006_auto__add_field_mirrorurl_has_ipv4__add_field_mirrorurl_has_ipv6.py
@@ -0,0 +1,76 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'MirrorUrl.has_ipv4'
+        db.add_column('mirrors_mirrorurl', 'has_ipv4', self.gf('django.db.models.fields.BooleanField')(default=True), keep_default=False)
+
+        # Adding field 'MirrorUrl.has_ipv6'
+        db.add_column('mirrors_mirrorurl', 'has_ipv6', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'MirrorUrl.has_ipv4'
+        db.delete_column('mirrors_mirrorurl', 'has_ipv4')
+
+        # Deleting field 'MirrorUrl.has_ipv6'
+        db.delete_column('mirrors_mirrorurl', 'has_ipv6')
+
+
+    models = {
+        'mirrors.mirror': {
+            'Meta': {'ordering': "('country', 'name')", 'object_name': 'Mirror'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'admin_email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'blank': 'True'}),
+            'country': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'isos': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_password': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}),
+            'rsync_user': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}),
+            'tier': ('django.db.models.fields.SmallIntegerField', [], {'default': '2'}),
+            'upstream': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['mirrors.Mirror']", 'null': 'True'})
+        },
+        'mirrors.mirrorlog': {
+            'Meta': {'object_name': 'MirrorLog'},
+            'check_time': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'duration': ('django.db.models.fields.FloatField', [], {'null': 'True'}),
+            'error': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_success': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'last_sync': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'url': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'logs'", 'to': "orm['mirrors.MirrorUrl']"})
+        },
+        'mirrors.mirrorprotocol': {
+            'Meta': {'object_name': 'MirrorProtocol'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_download': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'protocol': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '10'})
+        },
+        'mirrors.mirrorrsync': {
+            'Meta': {'object_name': 'MirrorRsync'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.CharField', [], {'max_length': '24'}),
+            'mirror': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rsync_ips'", 'to': "orm['mirrors.Mirror']"})
+        },
+        'mirrors.mirrorurl': {
+            'Meta': {'object_name': 'MirrorUrl'},
+            'has_ipv4': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'has_ipv6': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mirror': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'urls'", 'to': "orm['mirrors.Mirror']"}),
+            'protocol': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'urls'", 'to': "orm['mirrors.MirrorProtocol']"}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        }
+    }
+
+    complete_apps = ['mirrors']
diff --git a/mirrors/models.py b/mirrors/models.py
index 44f081e..a6f4117 100644
--- a/mirrors/models.py
+++ b/mirrors/models.py
@@ -52,6 +52,8 @@ class MirrorUrl(models.Model):
     url = models.CharField(max_length=255)
     protocol = models.ForeignKey(MirrorProtocol, related_name="urls")
     mirror = models.ForeignKey(Mirror, related_name="urls")
+    has_ipv4 = models.BooleanField(default=True)
+    has_ipv6 = models.BooleanField(default=False)
 
     def __unicode__(self):
         return self.url
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
index 90baa75..7274dd5 100644
--- a/templates/mirrors/mirror_details.html
+++ b/templates/mirrors/mirror_details.html
@@ -47,6 +47,8 @@
             {% with mirror.urls.all as urls %}
             <td>{% if urls %}
                 {% for u in urls %}
+                {{ u.has_ipv4|yesno:"[IPv4]," }}
+                {{ u.has_ipv6|yesno:"[IPv6]," }}
                 <a href="{{ u.url }}">{{ u.url }}</a><br/>
                 {% endfor %}
                 {% else %}None{% endif %}
diff --git a/templates/mirrors/status_table.html b/templates/mirrors/status_table.html
index 240a545..9a7a3c3 100644
--- a/templates/mirrors/status_table.html
+++ b/templates/mirrors/status_table.html
@@ -4,6 +4,8 @@
         <tr>
             <th>Mirror URL</th>
             <th>Protocol</th>
+            <th>IPv4</th>
+            <th>IPv6</th>
             <th>Country</th>
             <th>Last Sync</th>
             <th>Completion %</th>
@@ -18,6 +20,8 @@
         <tr class="{% cycle 'odd' 'even' %}">
             <td>{{ m_url.url }}</td>
             <td>{{ m_url.protocol }}</td>
+            <td>{{ m_url.has_ipv4|yesno:"Yes," }}</td>
+            <td>{{ m_url.has_ipv6|yesno:"Yes," }}</td>
             <td>{{ m_url.mirror.country }}</td>
             <td>{{ m_url.last_sync|date:'Y-m-d H:i'|default:'unknown' }}</td>
             <td>{{ m_url.completion_pct|percentage:1 }}</td>