diff --git a/bin/swift-ring-builder b/bin/swift-ring-builder
index 41293f7d37..c6d91f92b4 100755
--- a/bin/swift-ring-builder
+++ b/bin/swift-ring-builder
@@ -48,6 +48,8 @@ The <search-value> can be of the form:
         /sdb1            Matches devices with the device name sdb1
         _shiny           Matches devices with shiny in the meta data
         _"snet: 5.6.7.8" Matches devices with snet: 5.6.7.8 in the meta data
+        [::1]            Matches devices in any zone with the ip ::1
+        z1-[::1]:5678    Matches devices in zone 1 with the ip ::1 and port 5678
     Most specific example:
         d74z1-1.2.3.4:5678/sdb1_"snet: 5.6.7.8"
     Nerd explanation:
@@ -76,6 +78,13 @@ The <search-value> can be of the form:
             i += 1
         match.append(('ip', search_value[:i]))
         search_value = search_value[i:]
+    elif len(search_value) and search_value[0] == '[':
+        i = 1
+        while i < len(search_value) and search_value[i] != ']':
+            i += 1
+        i += 1
+        match.append(('ip', search_value[:i].lstrip('[').rstrip(']')))
+        search_value = search_value[i:]
     if search_value.startswith(':'):
         i = 1
         while i < len(search_value) and search_value[i].isdigit():
@@ -110,6 +119,16 @@ The <search-value> can be of the form:
     return devs
 
 
+def format_device(dev):
+    """
+    Format a device for display.
+    """
+    if ':' in dev['ip']:
+        return 'd%(id)sz%(zone)s-[%(ip)s]:%(port)s/%(device)s_"%(meta)s"' % dev
+    else:
+        return 'd%(id)sz%(zone)s-%(ip)s:%(port)s/%(device)s_"%(meta)s"' % dev
+
+
 class Commands:
 
     def unknown():
@@ -236,10 +255,11 @@ swift-ring-builder <builder_file> add z<zone>-<ip>:<port>/<device_name>_<meta>
             exit(EXIT_ERROR)
         i = 1
         if rest[i] == '[':
+            i += 1
             while i < len(rest) and rest[i] != ']':
                 i += 1
-            ip = rest[2:i]
             i += 1
+            ip = rest[1:i].lstrip('[').rstrip(']')
             rest = rest[i:]
         else:
             while i < len(rest) and rest[i] in '0123456789.':
@@ -286,8 +306,12 @@ swift-ring-builder <builder_file> add z<zone>-<ip>:<port>/<device_name>_<meta>
         builder.add_dev({'id': next_dev_id, 'zone': zone, 'ip': ip,
                          'port': port, 'device': device_name, 'weight': weight,
                          'meta': meta})
-        print 'Device z%s-%s:%s/%s_"%s" with %s weight got id %s' % \
-              (zone, ip, port, device_name, meta, weight, next_dev_id)
+        if ':' in ip:
+            print 'Device z%s-[%s]:%s/%s_"%s" with %s weight got id %s' % \
+                  (zone, ip, port, device_name, meta, weight, next_dev_id)
+        else:
+            print 'Device z%s-%s:%s/%s_"%s" with %s weight got id %s' % \
+                  (zone, ip, port, device_name, meta, weight, next_dev_id)
         pickle.dump(builder, open(argv[1], 'wb'), protocol=2)
         exit(EXIT_RING_UNCHANGED)
 
@@ -349,6 +373,13 @@ swift-ring-builder <builder_file> set_info <search-value>
                 i += 1
             change.append(('ip', change_value[:i]))
             change_value = change_value[i:]
+        elif len(change_value) and change_value[0] == '[':
+            i = 1
+            while i < len(change_value) and change_value[i] != ']':
+                i += 1
+            i += 1
+            change.append(('ip', change_value[:i].lstrip('[').rstrip(']')))
+            change_value = change_value[i:]
         if change_value.startswith(':'):
             i = 1
             while i < len(change_value) and change_value[i].isdigit():
@@ -373,15 +404,13 @@ swift-ring-builder <builder_file> set_info <search-value>
         if len(devs) > 1:
             print 'Matched more than one device:'
             for dev in devs:
-                print '    d%(id)sz%(zone)s-%(ip)s:%(port)s/%(device)s_' \
-                      '"%(meta)s"' % dev
+                print '    %s' % format_device(dev)
             if raw_input('Are you sure you want to update the info for '
                          'these %s devices? (y/N) ' % len(devs)) != 'y':
                 print 'Aborting device modifications'
                 exit(EXIT_ERROR)
         for dev in devs:
-            orig_dev_string = \
-                'd%(id)sz%(zone)s-%(ip)s:%(port)s/%(device)s_"%(meta)s"' % dev
+            orig_dev_string = format_device(dev)
             test_dev = dict(dev)
             for key, value in change:
                 test_dev[key] = value
@@ -397,9 +426,7 @@ swift-ring-builder <builder_file> set_info <search-value>
                     exit(EXIT_ERROR)
             for key, value in change:
                 dev[key] = value
-            new_dev_string = \
-                'd%(id)sz%(zone)s-%(ip)s:%(port)s/%(device)s_"%(meta)s"' % dev
-            print 'Device %s is now %s' % (orig_dev_string, new_dev_string)
+            print 'Device %s is now %s' % (orig_dev_string, format_device(dev))
         pickle.dump(builder, open(argv[1], 'wb'), protocol=2)
         exit(EXIT_RING_UNCHANGED)