diff --git a/docs/changelog.rst b/docs/changelog.rst
index 21e995d..c35b573 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,7 @@
 Changelog
 =========
 
+* :feature:`-` implement creation of new mailboxes for hosting packages
 * :support:`-` move common form code to new module gvawebcore.forms
 * :feature:`-` make it possible to assign domains to a customer
 * :feature:`-` add hosting packages list for staff users
diff --git a/gnuviechadmin/gnuviechadmin/urls.py b/gnuviechadmin/gnuviechadmin/urls.py
index ebc4157..d8f621d 100644
--- a/gnuviechadmin/gnuviechadmin/urls.py
+++ b/gnuviechadmin/gnuviechadmin/urls.py
@@ -12,6 +12,7 @@ urlpatterns = patterns(
     url(r'^accounts/', include('allauth.urls')),
     url(r'^domains/', include('domains.urls')),
     url(r'^hosting/', include('hostingpackages.urls')),
+    url(r'^mail/', include('managemails.urls')),
     url(r'^osuser/', include('osusers.urls')),
     url(r'^admin/', include(admin.site.urls)),
 )
diff --git a/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html b/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html
index 43f0e2d..338622c 100644
--- a/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html
+++ b/gnuviechadmin/templates/hostingpackages/customerhostingpackage_detail.html
@@ -140,7 +140,7 @@
       <p class="panel-body text-info">{% trans "There are no mailboxes assigned to this hosting package yet." %}</p>
       {% endif %}
       {% if hostingpackage.may_add_mailbox %}
-      <p class="panel-body"><a href="#" class="btn btn-primary">{% trans "Add mailbox" %}</a></p>
+      <p class="panel-body"><a href="{% url 'create_mailbox' package=hostingpackage.id %}" class="btn btn-primary">{% trans "Add mailbox" %}</a></p>
       {% endif %}
     </div>
   </div>