diff --git a/netbox/dcim/migrations/0026_rack_group.py b/netbox/dcim/migrations/0026_rack_group.py
new file mode 100644
index 000000000..ad67f6dff
--- /dev/null
+++ b/netbox/dcim/migrations/0026_rack_group.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-01-18 11:16
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0025_devicetype_add_interface_ordering'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='rack',
+            options={'ordering': ['site', 'name', 'group']},
+        ),
+        migrations.AlterUniqueTogether(
+            name='rack',
+            unique_together=set([('site', 'facility_id'), ('site', 'name', 'group')]),
+        ),
+    ]
diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index bbc27b8d9..ed5b70323 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -403,9 +403,9 @@ class Rack(CreatedUpdatedModel, CustomFieldModel):
     objects = RackManager()
 
     class Meta:
-        ordering = ['site', 'name']
+        ordering = ['site', 'name', 'group']
         unique_together = [
-            ['site', 'name'],
+            ['site', 'name', 'group'],
             ['site', 'facility_id'],
         ]