diff --git a/dbtemplates/loader.py b/dbtemplates/loader.py
index 720f6bf..f9b7284 100644
--- a/dbtemplates/loader.py
+++ b/dbtemplates/loader.py
@@ -1,6 +1,5 @@
 import os
 from django.conf import settings
-from django.dispatch import dispatcher
 from django.db.models import signals
 from django.template import TemplateDoesNotExist
 from django.contrib.sites.models import Site
@@ -60,7 +59,7 @@ def load_template_source(template_name, template_dirs=None):
     raise TemplateDoesNotExist, template_name
 load_template_source.is_usable = True
 
-def remove_cached_template(instance):
+def remove_cached_template(instance, **kwargs):
     """
     Called via django's signals to remove cached templates, if the template in the
     database was changed or deleted.
@@ -72,6 +71,5 @@ def remove_cached_template(instance):
         except OSError:
             pass
 
-dispatcher.connect(remove_cached_template, sender=Template, signal=signals.post_save)
-dispatcher.connect(remove_cached_template, sender=Template, signal=signals.pre_delete)
-
+signals.post_save.connect(remove_cached_template, sender=Template)
+signals.pre_delete.connect(remove_cached_template, sender=Template)
diff --git a/dbtemplates/management/__init__.py b/dbtemplates/management/__init__.py
index 046290c..d9fb6a6 100644
--- a/dbtemplates/management/__init__.py
+++ b/dbtemplates/management/__init__.py
@@ -1,11 +1,10 @@
-from django.dispatch import dispatcher
 from django.db.models import signals
 from django.contrib.sites.models import Site
 
 from dbtemplates.models import Template
 from dbtemplates import models as template_app
 
-def create_default_templates(app, created_models, verbosity):
+def create_default_templates(app, created_models, verbosity, **kwargs):
     """Creates the default database template objects."""
     try:
         site = Site.objects.get_current()
@@ -45,4 +44,4 @@ def create_default_templates(app, created_models, verbosity):
                 template500.save()
                 template500.sites.add(site)
 
-dispatcher.connect(create_default_templates, sender=template_app, signal=signals.post_syncdb)
+signals.post_syncdb.connect(create_default_templates, sender=template_app)