diff --git a/django/contrib/auth/admin.py b/django/contrib/auth/admin.py
index ccf940d16d..5c08b0615f 100644
--- a/django/contrib/auth/admin.py
+++ b/django/contrib/auth/admin.py
@@ -54,7 +54,7 @@ class UserAdmin(admin.ModelAdmin):
     add_form = UserCreationForm
     change_password_form = AdminPasswordChangeForm
     list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff')
-    list_filter = ('is_staff', 'is_superuser', 'is_active')
+    list_filter = ('is_staff', 'is_superuser', 'is_active', 'groups')
     search_fields = ('username', 'first_name', 'last_name', 'email')
     ordering = ('username',)
     filter_horizontal = ('user_permissions',)
diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt
index 26b6ad1bfa..e2eac09237 100644
--- a/docs/releases/1.5.txt
+++ b/docs/releases/1.5.txt
@@ -116,6 +116,8 @@ Django 1.5 also includes several smaller improvements worth noting:
 * The :ref:`receiver <connecting-receiver-functions>` decorator is now able to
   connect to more than one signal by supplying a list of signals.
 
+* In the admin, you can now filter users by groups which they are members of.
+
 * :meth:`QuerySet.bulk_create()
   <django.db.models.query.QuerySet.bulk_create>` now has a batch_size
   argument. By default the batch_size is unlimited except for SQLite where