diff --git a/extras/website/website/templates/about.html b/extras/website/website/templates/about.html
index 4516c3240..a9e8b6bb0 100644
--- a/extras/website/website/templates/about.html
+++ b/extras/website/website/templates/about.html
@@ -60,8 +60,7 @@ und Steuerung von Tagesordnungen, Anträgen und Wahlen einer Veranstaltung.{% en
         und zeigt stets die aktuelle Folie an.{% endblocktrans %}
         </p>
         
-        <p><a class="btn btn-primary" href="{% url features
-            %}">{% trans 'Screenshots & Funktionen' %} &raquo;</a></p>
+        <p><a class="btn btn-primary" href="{% url features %}">{% trans 'Screenshots & Funktionen' %} &raquo;</a></p>
     </div>
     <div class="span4">
       <p><a class="btn btn-primary" href="{% url donate %}">
diff --git a/extras/website/website/templates/download.html b/extras/website/website/templates/download.html
index ab4bb811b..cd2094acb 100644
--- a/extras/website/website/templates/download.html
+++ b/extras/website/website/templates/download.html
@@ -17,7 +17,7 @@
       <h3>{% trans 'Für Windows' %}</h3>
       <p>
       <a class="jumbotron btn btn-primary btn-large"
-      href="http://openslides.org/download/openslides-1.2-portable.zip">
+      href="http://files.openslides.org/openslides-1.2-portable.zip">
       {% trans 'Download OpenSlides' %}<br>
       <small>v1.2 | .zip | 10 MB</small></a>
       </p>
@@ -29,7 +29,7 @@
       <h3>{% trans 'Für Linux/MacOS' %}</h3>
       <p>
       <a class="jumbotron btn btn-primary btn-large"
-      href="http://openslides.org/download/openslides-1.2.tar.gz">
+      href="http://files.openslides.org/openslides-1.2.tar.gz">
       {% trans 'Download OpenSlides' %} <br><small>v1.2 | .tar.gz | 1 MB</small></a>
       </p>
       <p>{% blocktrans %}Folgen Sie der <a href="http://openslides.org/download/INSTALL-1.2.txt">Installationsanleitung</a> 
@@ -39,7 +39,7 @@
   <br>
   <p>
   <a class="btn btn-large"
-  href="http://openslides.org/download/">
+  href="http://files.openslides.org/">
   {% trans 'Ältere Versionen und Prüfsummen' %} &raquo;</a>
   </p>
   <br>
diff --git a/extras/website/website/urls.py b/extras/website/website/urls.py
index 0fb96fde1..d2b43d0df 100644
--- a/extras/website/website/urls.py
+++ b/extras/website/website/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import patterns, include, url
 from django.conf.urls.i18n import i18n_patterns
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-from django.views.generic import TemplateView
+from django.views.generic import TemplateView, RedirectView
 
 from website import views
 
@@ -9,20 +9,20 @@ urlpatterns = i18n_patterns('',
     url(r'^i18n/', include('django.conf.urls.i18n')),
     url(r'^$', TemplateView.as_view(template_name="home.html"), name='home',),
     url(r'^about/$', TemplateView.as_view(template_name="about.html"), name='about',),
-    url(r'^about/features$', TemplateView.as_view(template_name="features.html"), name='features',),
-    url(r'^about/license$', TemplateView.as_view(template_name="license.html"), name='license',),
-    url(r'^about/references$', TemplateView.as_view(template_name="references.html"), name='references',),
-    url(r'^about/press$', TemplateView.as_view(template_name="press.html"), name='press',),
+    url(r'^about/features/$', TemplateView.as_view(template_name="features.html"), name='features',),
+    url(r'^about/license/$', TemplateView.as_view(template_name="license.html"), name='license',),
+    url(r'^about/references/$', TemplateView.as_view(template_name="references.html"), name='references',),
+    url(r'^about/press/$', TemplateView.as_view(template_name="press.html"), name='press',),
     url(r'^download/$', TemplateView.as_view(template_name="download.html"), name='download',),
     url(r'^pricing/$', TemplateView.as_view(template_name="pricing.html"), name='pricing',),
     url(r'^pricing/order/(?P<package>(1|2|3|4))$', 'website.views.orderform', name='orderform',),
-    url(r'^pricing/thanks$', TemplateView.as_view(template_name="thanks-order.html"), name='thanksorder',),
+    url(r'^pricing/thanks/$', TemplateView.as_view(template_name="thanks-order.html"), name='thanksorder',),
     url(r'^manual/$', TemplateView.as_view(template_name="manual.html"), name='manual',),
     url(r'^faq/$', TemplateView.as_view(template_name="faq.html"), name='faq',),
     url(r'^development/$', TemplateView.as_view(template_name="development.html"), name='development',),
     url(r'^contact/$', TemplateView.as_view(template_name="contact.html"), name='contact',),
-    url(r'^contact/form$', 'website.views.contactform', name='contactform',),
-    url(r'^contact/thanks$', TemplateView.as_view(template_name="thanks-contact.html"), name='thankscontact',),
+    url(r'^contact/form/$', 'website.views.contactform', name='contactform',),
+    url(r'^contact/thanks/$', TemplateView.as_view(template_name="thanks-contact.html"), name='thankscontact',),
     url(r'^donate/$', TemplateView.as_view(template_name="donate.html"), name='donate',),
     url(r'^demo/$', TemplateView.as_view(template_name="demo.html"), name='demo',),
     url(r'^impressum/$', TemplateView.as_view(template_name="impressum.html"), name='impressum',),
@@ -31,4 +31,17 @@ urlpatterns = i18n_patterns('',
 
 urlpatterns += patterns('django.contrib.staticfiles.views',
     url(r'^static/(?P<path>.*)$', 'serve', {'insecure':True}),
-)
\ No newline at end of file
+)
+
+# permanent redirect patterns
+urlpatterns += patterns('',
+    # redirect old download files to new download directory
+    (r'^download/(.*)$', RedirectView.as_view(url='http://files.openslides.org')),
+    # redirect old web pages to new pages
+    (r'^(de|en)/index.html$', RedirectView.as_view(url='/')),
+    (r'^(de|en)/about.html$', RedirectView.as_view(url='/about/')),
+    (r'^(de|en)/features.html$', RedirectView.as_view(url='/about/features/')),
+    (r'^(de|en)/download.html$', RedirectView.as_view(url='/download/')),
+    (r'^(de|en)/demo.html$', RedirectView.as_view(url='/demo/')),
+    (r'^(de|en)/contact.html$', RedirectView.as_view(url='/contact/')),
+)