diff --git a/bootstrapform/templatetags/bootstrap.py b/bootstrapform/templatetags/bootstrap.py
index 163cbe0..909d714 100644
--- a/bootstrapform/templatetags/bootstrap.py
+++ b/bootstrapform/templatetags/bootstrap.py
@@ -7,12 +7,19 @@ register = template.Library()
 @register.filter
 def bootstrap(element):
     element_type = element.__class__.__name__.lower()
+
     if element_type == 'boundfield':
         template = get_template("bootstrapform/field.html")
         context = Context({'field': element})
     else:
-        template = get_template("bootstrapform/form.html")
-        context = Context({'form': element})
+        has_management = getattr(element, 'management_form', None)
+        print "has management", has_management
+        if has_management:
+            template = get_template("bootstrapform/formset.html")
+            context = Context({'formset': element})
+        else:
+            template = get_template("bootstrapform/form.html")
+            context = Context({'form': element})
         
     return template.render(context)
 
diff --git a/bootstrapform/templatetags/formset.html b/bootstrapform/templatetags/formset.html
new file mode 100644
index 0000000..b3cbd12
--- /dev/null
+++ b/bootstrapform/templatetags/formset.html
@@ -0,0 +1,5 @@
+{{ formset.management_form }}
+{% for form in formset %}
+    {% include "bootstrapform/form.html" with form=form %}
+{% endfor %}
+