diff --git a/shortener/urls.py b/shortener/urls.py
index 19c3abe..390eeb7 100644
--- a/shortener/urls.py
+++ b/shortener/urls.py
@@ -1,4 +1,8 @@
-from django.conf.urls.defaults import patterns, url
+try:
+    from django.conf.urls import patterns, url
+except:
+    # Django <=1.5
+    from django.conf.urls.defaults import patterns, url
 
 
 urlpatterns = patterns('shortener.views',
diff --git a/templates/base.html b/templates/base.html
index 20cdfb6..480256d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -5,7 +5,7 @@
   </head>
 
   <body>
-      <h1><a href="{% url index %}">{{ request.META.HTTP_HOST }}</a></h1>
+      <h1><a href="{% url 'index' %}">{{ request.META.HTTP_HOST }}</a></h1>
       <hr/>
       {% block content %}{% endblock %}
 
@@ -15,7 +15,7 @@ <h1><a href="{% url index %}">{{ request.META.HTTP_HOST }}</a></h1>
       {% block bookmarklet %}
       <br/>
       Bookmarklet (drag this to your bookmarks bar):<br/>
-      <a href="javascript:(function(){var a=window,b=document,c=encodeURIComponent;d=a.open(&#39;//{{ request.META.HTTP_HOST }}/submit/?u=&#39;+c(b.location));})();">Shorten with {{ request.META.HTTP_HOST }}</a>
+      <a href="javascript:(function(){var a=window,b=document,c=encodeURIComponent;d=a.open(&#39;//{{ request.META.HTTP_HOST }}{% url 'index' %}submit/?u=&#39;+c(b.location));})();">Shorten with {{ request.META.HTTP_HOST }}</a>
       {% endblock %}
 
     {% block extra_body %}{% endblock %}
diff --git a/templates/shortener/form.inc.html b/templates/shortener/form.inc.html
index 959dda9..a19b1f9 100644
--- a/templates/shortener/form.inc.html
+++ b/templates/shortener/form.inc.html
@@ -1,5 +1,5 @@
 {% if link_form %}
-  <form name="url_form" action="{% url submit %}" method="post">
+  <form name="url_form" action="{% url 'submit' %}" method="post">
     {% csrf_token %}
     {{ link_form.as_p }}
     <input type="submit" value="Shorten" />
diff --git a/templates/shortener/index.html b/templates/shortener/index.html
index ac37b42..766e5c3 100644
--- a/templates/shortener/index.html
+++ b/templates/shortener/index.html
@@ -6,7 +6,7 @@ <h2>Recent Links</h2>
 <ul>
   {% for link in recent_links %}
     <li><a href="{% short_url link %}">{{ link.url }}</a> (Count: {{ link.usage_count }})
-    (<a href="{% url info link.to_base62 %}">Info</a>)</li>
+    (<a href="{% url 'info' link.to_base62 %}">Info</a>)</li>
   {% endfor %}
 </ul>
 
@@ -14,7 +14,7 @@ <h2>Most Popular Links</h2>
 <ul>
   {% for link in most_popular_links %}
     <li><a href="{% short_url link %}">{{ link.url }}</a> (Count: {{ link.usage_count }})
-    (<a href="{% url info link.to_base62 %}">Info</a>)</li>
+    (<a href="{% url 'info' link.to_base62 %}">Info</a>)</li>
   {% endfor %}
 </ul>
 {% endblock content %}
