diff --git a/.htaccess b/.htaccess
index f93196b74e..82c190ec94 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,169 +1,259 @@
+# This file handles all redirects/rewrites for fsfe.org
+# Some of the rewrites are for shorter URLs, most for support of
+# changed URLs or deleted pages.
+#
+# Some redirect definitions cannot be handled by this file and therefore
+# are places directly in the webserver configuration:
+#   https://git.fsfe.org/fsfe-system-hackers/webserver-bunsen/src/branch/master/files/apache2-sites/fsfe.org.conf
+#
+# Please do not create other .htaccess files in this project! It would
+# overwrite rewrites concerning its directories in this file and
+# and thereby create a lot of confusion.
+
 RewriteEngine On
 
 # Favicon
-RewriteRule ^favicon.ico /graphics/fsfe.ico [redirect=permanent]
-RewriteRule ^graphics/fsfeurope.ico /graphics/fsfe.ico [redirect=permanent]
+RewriteRule ^favicon.ico /graphics/fsfe.ico [R=301,L]
+RewriteRule ^graphics/fsfeurope.ico /graphics/fsfe.ico [R=301,L]
 
-## === SHORT URLs ===
 
-# Translators redirect
-RewriteRule ^translate /contribute/translators/ [redirect=permanent]
+# =============================================================================
+# SHORT URLS
+# =============================================================================
 
-# Old supporter database
-RewriteRule ^support(/.*)? /join [redirect=permanent,L]
-RewriteRule ^join(/.*)?$ https://my.fsfe.org/donate [R=301,L]
+# Redirect
+RewriteRule ^translate /contribute/translators/ [R=301,L]
 
-# AskYourCandidates redirect
-RewriteRule ^campaigns/ayc(.*) /campaigns/askyourcandidates$1 [redirect=permanent]
+# AskYourCandidates
+RewriteRule ^campaigns/ayc(.*) /campaigns/askyourcandidates$1 [R=301,L]
 
 # NoCloud campaign, as printed on posters
-RewriteRUle ^nocloud(/.*)?	/activities/nocloud$1	[redirect=permanent]
+RewriteRule ^nocloud(/.*)?  /activities/nocloud$1 [R=301,L]
 
-# Short cut for promo order
-RewriteRUle ^promo(/.*)?	/contribute/spreadtheword$1	[redirect=permanent]
+# Promotion material order
+RewriteRule ^promo(/.*)?  /contribute/spreadtheword$1 [R=301,L]
 
-# Redirect convince your friends easy pages to the wiki page
-RewriteRule   ^(cyf|convince).*      http://wiki.fsfe.org/ConvinceYourFriends        [R=permanent]
+# Convince your friends
+RewriteRule   ^(cyf|convince).* http://wiki.fsfe.org/ConvinceYourFriends [R=301,L]
 
 # Summit 2016
-RewriteRule	^summit16(/.*)?$	https://fsfe.org/community/events/2016/summit/frontpage$1 [redirect=permanent]
-#RewriteRule	^summit16(/.*)?$	https://wiki.fsfe.org/Events/Summit2016/CallForParticipation$1	[redirect=permanent]
+RewriteRule ^summit16(/.*)?$  https://fsfe.org/community/events/2016/summit/frontpage$1 [R=301,L]
+#RewriteRule  ^summit16(/.*)?$  https://wiki.fsfe.org/Events/Summit2016/CallForParticipation$1  [R=301,L]
 
 # 15 years of FSFE
-RewriteRule	^15(/.*)?$		https://fsfe.org/campaigns/15years/15years$1 [redirect=permanent]
+RewriteRule ^15(/.*)?$    https://fsfe.org/campaigns/15years/15years$1 [R=301,L]
 
 # EU policies wiki page, e.g. linked from the PMPC brochure
-RewriteRule ^fs-policies/?$ https://wiki.fsfe.org/Activities/EU_Policies_overview_FS [redirect=permanent]
+RewriteRule ^fs-policies/?$ https://wiki.fsfe.org/Activities/EU_Policies_overview_FS [R=301,L]
 
-# Podcast rules for better links
-RewriteRule ^news/podcast/?$ /news/podcast.html [redirect=permanent]
-RewriteRule ^news/podcast.rss$ /news/podcast.en.rss [L,redirect=permanent]
-RewriteRule ^news/podcast-opus.rss$ /news/podcast-opus.en.rss [L,redirect=permanent]
-
-## === MOVED PAGES ===
-
-# Redirections for IloveFS campaign
-RewriteRule ^campaigns/ilovefs/latest-report(.*)$ /news/2019/news-20190329-01.html [redirect=permanent] # UPDATE always link to latest available report
-RewriteRule ^campaigns/ilovefs/ilovefs(.*)html$ /campaigns/ilovefs/index$1html [redirect=permanent]
-RewriteRule ^campaigns/ilovefs((/?)|(/[^/]*).html)$ /campaigns/ilovefs/2019$1 [PT] # UPDATE year
-RewriteRule ^campaigns/ilovefs/(201[2-5])/index(.*)$ /campaigns/ilovefs/$1/ [redirect=permanent]
-RewriteRule ^campaigns/ilovefs/(201[2-5])(/?)$ /campaigns/ilovefs/$1/ilovefs.html
-
-
-RewriteRule ^(.*)\.no.html /$1.nb.html [redirect=permanent]
-RewriteRule ^(.*)\.no.rss /$1.nb.rss [redirect=permanent]
-RewriteRule ^contact/press(.*) /press/press$1 [redirect=permanent]
-RewriteRule ^standards(.*) /projects/os$1 [redirect=permanent]
-RewriteRule ^education(.*) /projects/education$1 [redirect=permanent]
-RewriteRule ^ftf(.*) /activities/ftf$1 [redirect=permanent]
-RewriteRule ^stacs(.*) /projects/stacs$1 [redirect=permanent]
-RewriteRule ^gbn(.*) /projects/gbn$1 [redirect=permanent]
-RewriteRule ^law/eucd/(.*) /projects/eucd$1 [redirect=permanent]
-RewriteRule ^law(.*) /projects/law$1 [redirect=permanent]
-RewriteRule ^swpat(.*) /projects/swpat$1 [redirect=permanent]
-RewriteRule ^donate.html /donate/donate.en.html [redirect=permanent]
-RewriteRule ^associates/about(.*) /associates/associates$1 [redirect=permanent]
-RewriteRule ^contribute/traineeship(.*) /contribute/internship$1 [redirect=permanent]
-RewriteRule ^contribute/donate(.*) /donate$1 [redirect=permanent]
-RewriteRule ^contact/local(.*) /about/localteams$1 [redirect=permanent]
-RewriteRule ^donate(/?|/donate/?|/donate\..*|/index.*)$ https://my.fsfe.org/donate [redirect=permanent]
-
-# New year's resolution in 2009.
-RewriteRule ^2009$ /news/2009/nyr.html [redirect=permanent]
-RewriteRule ^2009/$ /news/2009/nyr.html [redirect=permanent]
-
-# Help section redirs.
-RewriteRule ^help/?$ /contribute/ [redirect=permanent]
-RewriteRule ^help/index(.*) /contribute/contribute$1 [redirect=permanent]
-RewriteRule ^help/help(.*) /contribute/contribute$1 [redirect=permanent]
-RewriteRule ^help/web\.(.*) /contribute/web/web.$1 [redirect=permanent]
-RewriteRule ^help/(.*) /donate/$1 [redirect=permanent]
-
-# Valentine campaign redirects.
-# 2010
-RewriteRule ^valentine-2010/(.*) /campaigns/valentine/2010/$1 [redirect=permanent]
-RewriteRule ^vd2010/(.*) /campaigns/valentine/2010/$1 [redirect=permanent]
-RewriteRule ^campaigns/vd2010/vd2010(.*) /campaigns/valentine/2010/valentine-2010$1 [redirect=permanent]
-RewriteRule ^campaigns/valentine-2010/vd2010(.*) /campaigns/valentine/2010/valentine-2010$1 [redirect=permanent]
-RewriteRule ^campaigns/valentine-2010/(.*).png /campaigns/valentine/$1.png [redirect=permanent]
-RewriteRule ^campaigns/valentine-2010/(.*).svg /campaigns/valentine/$1.svg [redirect=permanent]
-RewriteRule ^campaigns/vd2010/(.*) /campaigns/valentine/2010/$1 [redirect=permanent]
-RewriteRule ^campaigns/vd2010 /campaigns/valentine/2010/valentine-2010 [redirect=permanent]
-# current
-RewriteRule ^valentine/valentine(.*) /campaigns/valentine/2011/valentine-2011$1 [redirect=permanent]
-
-# trying fix the dirty hack redirection loop from 2011-06-30
-RewriteRule ^campaigns/valentine(/?)$ /campaigns/valentine/2011/valentine-2011 [redirect=temp]
-RewriteRule ^campaigns/valentine/2011(/?)$ /campaigns/valentine/2011/valentine-2011 [redirect=temp]
-
-
-# Temporary fix unitl we have a /freesoftware dir for contribute/advocacy/cwfs.en.html
-# RewriteRule ^freesoftware/freesoftware(.*) /about/basics/freesoftware$1 [redirect=temp]
-
-# Rewrite for dead links to gnupg-ccid stuff
-RewriteRule ^en/content/download/17665/125518/file/gnupg-ccid.rules http://wiki.fsfe.org/Card_howtos/Card_reader_setup_(udev)?action=AttachFile&do=view&target=gnupg-ccid.rules [redirect=permanent]
-RewriteRule ^en/content/download/15872/77909/file/gnupg-ccid http://wiki.fsfe.org/Card_howtos/Card_reader_setup_(udev)?action=AttachFile&do=view&target=gnupg-ccid [redirect=permanent]
-
-# Redirects to reduce 404's
-RewriteRule ^en/layout/set/rss/content/view/full/5116 http://blogs.fsfe.org/ciaran/?feed=rss2 [redirect=permanent]
-RewriteRule ^en/layout/set/rss/content/view/full/5009 http://blogs.fsfe.org/maffulli/?feed=rss2 [redirect=permanent]
-RewriteRule ^en/layout/set/rss/content/view/full/4972 http://blogs.fsfe.org/gerloff/?feed=rss2 [redirect=permanent]
-RewriteRule ^en/layout/set/rss/content/view/full/5971 http://blogs.fsfe.org/jj/?feed=rss2 [redirect=permanent]
-RewriteRule ^en/layout/set/rss/content/view/full/6128 http://blogs.fsfe.org/jj/?feed=rss2 [redirect=permanent]
-RewriteRule ^en/layout/set/rss/content/view/full/4974 http://blogs.fsfe.org/greve/?feed=rss2 [redirect=permanent]
-RewriteRule ^en/news http://fsfe.org/news/ [redirect=permanent]
-RewriteRule ^people/greve /about/greve/ [redirect=permanent]
-RewriteRule ^projects/fellowship /fellowship/ [redirect=permanent]
-RewriteRule ^fellowship/contact /contact/contact.html [redirect=permanent]
-RewriteRule ^en/rss/feed/news.xml /news/news.en.rss [redirect=permanent]
-RewriteRule ^en/rss/feed/events.xml /events/events.en.rss  [redirect=permanent]
-RewriteRule ^news/fsfe-fr-channel.fr.xml /news/news.fr.rss [redirect=permanent]
-RewriteRule ^about/members(.*) /about/team$1 [redirect=permanent]
-
-# Moved news pages
-RewriteRule ^news/2016/news-20160629-01(.*) /news/2016/news-20160630-01$1 [redirect=permanent]
-
-# Legal pages redirects
-RewriteRule ^ftf(.*) /activities/ftf$1 [redirect=permanent]
-RewriteRule ^legal(.*) /activities/ftf$1 [redirect=permanent]
-RewriteRule ^activities/ftf/rough-guide-for-users(.*) /projects/ftf/useful-tips-for-users$1 [redirect=permanent]
-RewriteRule ^activities/ftf/rough-guide-for-vendors(.*) /projects/ftf/useful-tips-for-vendors$1 [redirect=permanent]
-RewriteRule ^activities/ftf/contact(.*) /contact/contact$1#ftf [NE,redirect=permanent]
-RewriteRule ^activities/ftf/form(.*) /contact/contact$1#ftf [NE,redirect=permanent]
-RewriteRule ^activities/ftf/ftf\.(.*)html /activities/ftf/activities.$1html [redirect=permanent]
-RewriteRule ^activities/ftf/$ /activities/ftf/activities.html [redirect=permanent]
-RewriteRule ^activities/ftf/index\.(.*)html /activities/ftf/activities.$1html [redirect=permanent]
-RewriteRule ^activities/ftf/network\.(.*)html /activities/ftf/ln.$1html [redirect=permanent]
-RewriteRule ^activities/ftf/recommended\.(.*)html /activities/ftf/licence-questions.$1html [redirect=permanent]
-RewriteRule ^activities/ftf/legal-network-policy\.(.*)html /activities/ftf/ln-rules.$1html [redirect=permanent]
-RewriteRule ^activities/ftf/education /activities/ftf/services.html [redirect=permanent]
-
-# Old staff profiles
-RewriteRule ^about/bako(.*) /about/team [redirect=permanent]
-RewriteRule ^about/polvani(.*) /about/team [redirect=permanent]
-RewriteRule ^about/tuke(.*) /about/team [redirect=permanent]
-
-# This recipie makes sure that permanent redirects are not cached
-# indefinitely, but re-validated every 10 minutes.
-# NOTE: Enable this when we get an Apache 2.4 :-/
-#Header append Cache-Control s-maxage=600 "expr=%{REQUEST_STATUS} == 301"
-#Header append Cache-Control max-age=600 "expr=%{REQUEST_STATUS} == 301"
-
-# Nicer URL for share buttons
+# Share buttons
 RewriteRule ^share/?$ /cgi-bin/share.php [NC,L]
 
 
-# Removal of duplicate information, and deprecating /fellowship/
-RewriteRule ^about/community /contact/community.html [redirect=permanent]
-RewriteRule ^fellowship/communicate /contact/community.html [redirect=permanent]
-RewriteRule ^fellowship/faq https://wiki.fsfe.org/KnowHow/FSFELife/FAQ [redirect=permanent]
-RewriteRule ^fellowship/card https://wiki.fsfe.org/TechDocs/CardHowtos [redirect=permanent]
-RewriteRule ^fellowship/new-group https://wiki.fsfe.org/KnowHow/Groups/CoordinatorsHandbook [redirect=permanent]
-RewriteRule ^fellowship/events(.*) https://fsfe.org/events$1 [redirect=permanent]
-RewriteRule ^fellowship/payment(.*) https://fsfe.org/donate/payment$1 [redirect=permanent]
-RewriteRule ^fellowship/groups https://wiki.fsfe.org/LocalGroups [redirect=permanent]
-RewriteRule ^fellowship/groups/berlin https://wiki.fsfe.org/LocalGroups/Berlin [redirect=permanent]
-RewriteRule ^fellowship/groups/coordinators https://wiki.fsfe.org/Teams/Coordinators [redirect=permanent]
-RewriteRule ^login https://my.fsfe.org/ [redirect=permanent]
-RewriteRule ^fellowship/graphics/people - [L]
-RewriteRule ^fellowship	/ [redirect=permanent]
+# =============================================================================
+# CAMPAIGN/TOPIC-SPECIFIC REDIRECTS
+# =============================================================================
+
+# Podcast
+RewriteRule ^news/podcast/?$ /news/podcast.html [R=301,L]
+RewriteRule ^news/podcast.rss$ /news/podcast.en.rss [L,R=301]
+RewriteRule ^news/podcast-opus.rss$ /news/podcast-opus.en.rss [L,R=301]
+
+# ILoveFS
+# TODO each year: update links for next two lines
+RewriteRule ^campaigns/ilovefs(/?$|/[^/]*.html$) /campaigns/ilovefs/2019$1 [PT,L]
+RewriteRule ^campaigns/ilovefs/latest-report.*$ /news/2019/news-20190329-01.html [R=301,L]
+RewriteRule ^campaigns/ilovefs/ilovefs(.*)html$ /campaigns/ilovefs/index$1html [R=301,L]
+RewriteRule ^campaigns/ilovefs/(201[2-5])/index(.*)$ /campaigns/ilovefs/$1/ [R=301,L]
+RewriteRule ^campaigns/ilovefs/(201[2-5])(/?)$ /campaigns/ilovefs/$1/ilovefs.html [R=301,L]
+# old URLs
+RewriteRule ^valentine.* /campaigns/ilovefs [R=301,L]
+RewriteRule ^vd20.* /campaigns/ilovefs [R=301,L]
+RewriteRule ^campaigns/valentine.* /campaigns/ilovefs [R=301,L]
+RewriteRule ^campaigns/vd20.* /campaigns/ilovefs [R=301,L]
+
+# Help section
+RewriteRule ^help/?$ /contribute/ [R=301,L]
+RewriteRule ^help/index(.*) /contribute/contribute$1 [R=301,L]
+RewriteRule ^help/help(.*) /contribute/contribute$1 [R=301,L]
+RewriteRule ^help/web\.(.*) /contribute/web/web.$1 [R=301,L]
+RewriteRule ^help/(.*) /donate/$1 [R=301,L]
+
+# Legal team pages
+RewriteRule ^ftf(.*)$ /activities/ftf$1 [R=301,L]
+RewriteRule ^legal(.*)$ /activities/ftf$1 [R=301,L]
+RewriteRule ^activities/ftf/?$ /activities/ftf/activities.html [R=301,L]
+RewriteRule ^activities/ftf/ftf\.(.*)html /activities/ftf/activities.$1html [R=301,L]
+RewriteRule ^activities/ftf/index\.(.*)html /activities/ftf/activities.$1html [R=301,L]
+RewriteRule ^activities/ftf/rough-guide-for-users(.*)$ /projects/ftf/useful-tips-for-users$1 [R=301,L]
+RewriteRule ^activities/ftf/rough-guide-for-vendors(.*)$ /projects/ftf/useful-tips-for-vendors$1 [R=301,L]
+RewriteRule ^activities/ftf/contact(.*)$ /contact/contact$1#ftf [NE,R=301]
+RewriteRule ^activities/ftf/form(.*)$ /contact/contact$1#ftf [NE,R=301]
+RewriteRule ^activities/ftf/network\.(.*)html /activities/ftf/ln.$1html [R=301,L]
+RewriteRule ^activities/ftf/recommended\.(.*)html /activities/ftf/licence-questions.$1html [R=301,L]
+RewriteRule ^activities/ftf/legal-network-policy\.(.*)html /activities/ftf/ln-rules.$1html [R=301,L]
+RewriteRule ^activities/ftf/education.*$ /activities/ftf/services.html [R=301,L]
+
+
+# =============================================================================
+# MOVED PAGES
+# =============================================================================
+
+# News
+RewriteRule ^news/fsfe-fr-channel.fr.xml /news/news.fr.rss [R=301,L]
+RewriteRule ^2009/?$ /news/2009/nyr.html [R=301,L]
+RewriteRule ^news/2016/news-20160629-01(.*)$ /news/2016/news-20160630-01$1 [R=301,L]
+
+# Old staff profiles
+RewriteRule ^about/(bako|polvani|tuke|maffulli|jakobs|oriordan)(/.*)?$ /about/team [R=301,L]
+RewriteRule ^about/nanda(/.*)?$ /about/weiden [R=301,L]
+RewriteRule ^people/greve(/.*)?$ /about/greve [R=301,L]
+
+# /en/.*
+RewriteRule ^en/layout/set/rss/content/view/full/5116 http://blogs.fsfe.org/ciaran/?feed=rss2 [R=301,L]
+RewriteRule ^en/layout/set/rss/content/view/full/5009 http://blogs.fsfe.org/maffulli/?feed=rss2 [R=301,L]
+RewriteRule ^en/layout/set/rss/content/view/full/4972 http://blogs.fsfe.org/gerloff/?feed=rss2 [R=301,L]
+RewriteRule ^en/layout/set/rss/content/view/full/5971 http://blogs.fsfe.org/jj/?feed=rss2 [R=301,L]
+RewriteRule ^en/layout/set/rss/content/view/full/6128 http://blogs.fsfe.org/jj/?feed=rss2 [R=301,L]
+RewriteRule ^en/layout/set/rss/content/view/full/4974 http://blogs.fsfe.org/greve/?feed=rss2 [R=301,L]
+RewriteRule ^en/news http://fsfe.org/news/ [R=301,L]
+RewriteRule ^en/rss/feed/news.xml /news/news.en.rss [R=301,L]
+RewriteRule ^en/rss/feed/events.xml /events/events.en.rss  [R=301,L]
+RewriteRule ^en/content/download/17665/125518/file/gnupg-ccid.rules http://wiki.fsfe.org/Card_howtos/Card_reader_setup_(udev)?action=AttachFile&do=view&target=gnupg-ccid.rules [R=301,L]
+RewriteRule ^en/content/download/15872/77909/file/gnupg-ccid http://wiki.fsfe.org/Card_howtos/Card_reader_setup_(udev)?action=AttachFile&do=view&target=gnupg-ccid [R=301,L]
+
+# Tags
+RewriteRule ^tags/tagged(\...)(\.html)?$ /tags/tags$1.html [R=301,L]
+
+# Documents
+RewriteRule ^documents/fp6(.*) /projects/fp6$1 [R=301,L]
+RewriteRule ^documents/whatwedo(.*) /about/basics/whatwedo$1 [R=301,L]
+RewriteRule ^documents/gnuproject(.*) /freesoftware/basics/gnuproject$1 [R=301,L]
+RewriteRule ^documents/whyweexist(.*) /about/basics/whyweexist$1 [R=301,L]
+RewriteRule ^documents/freesoftware(.*) /about/basics/freesoftware$1 [R=301,L]
+RewriteRule ^documents/preamble(.*) /about/history/preamble$1 [R=301,L]
+RewriteRule ^documents/doi(.*) /about/history/doi$1 [R=301,L]
+RewriteRule ^documents/msooxml(.*) /projects/os/msooxml$1 [R=301,L]
+RewriteRule ^documents/iprip(.*) /projects/wipo/iprip$1 [R=301,L]
+RewriteRule ^documents/wiwo(.*) /projects/wipo/wiwo$1 [R=301,L]
+RewriteRule ^documents/printable/(.*) /about/printable/$1 [R=301,L]
+RewriteRule ^documents/reports/(.*) /about/reports/$1 [R=301,L]
+RewriteRule ^documents/rms-fs-2006-03-09(.*) /freesoftware/transcripts/rms-fs-2006-03-09$1 [R=301,L]
+
+# Projects
+RewriteRule ^projects/agnula(.*) /campaigns/agnula$1 [R=301,L]
+RewriteRule ^projects/bgw(.*) /campaigns/bgw$1 [R=301,L]
+RewriteRule ^projects/browserbundling(.*) /campaigns/browserbundling$1 [R=301,L]
+RewriteRule ^projects/btw09(.*) /campaigns/btw09$1 [R=301,L]
+RewriteRule ^projects/eucd(.*) /campaigns/eucd$1 [R=301,L]
+RewriteRule ^projects/gbn(.*) /campaigns/gbn$1 [R=301,L]
+RewriteRule ^projects/gplv3(.*) /campaigns/gplv3$1 [R=301,L]
+RewriteRule ^projects/horizon2020(.*) /campaigns/horizon2020$1 [R=301,L]
+RewriteRule ^projects/ipred2(.*) /campaigns/ipred2$1 [R=301,L]
+RewriteRule ^projects/mankind(.*) /campaigns/mankind$1 [R=301,L]
+RewriteRule ^projects/pdfreaders(.*) /campaigns/pdfreaders$1 [R=301,L]
+RewriteRule ^projects/self(.*) /campaigns/self$1 [R=301,L]
+RewriteRule ^projects/stacs(.*) /campaigns/stacs$1 [R=301,L]
+RewriteRule ^projects/swpat(.*) /campaigns/swpat$1 [R=301,L]
+RewriteRule ^projects/wsis(.*) /campaigns/wsis$1 [R=301,L]
+RewriteRule ^projects/active(.*)html$ /campaigns/campaigns$1html [R=301,L]
+RewriteRule ^projects/finished(.*)html$ /campaigns/campaigns$1html [R=301,L]
+RewriteRule ^projects/inactive(.*)html$ /campaigns/campaigns$1html [R=301,L]
+RewriteRule ^projects/drm(.*) /activities/drm$1 [R=301,L]
+RewriteRule ^projects/education(.*) /activities/education$1 [R=301,L]
+RewriteRule ^projects/os(.*) /activities/os$1 [R=301,L]
+RewriteRule ^projects/procurement(.*) /activities/procurement$1 [R=301,L]
+RewriteRule ^projects/eu(.*) /activities/eu$1 [R=301,L]
+RewriteRule ^projects/ftf(.*) /activities/ftf$1 [R=301,L]
+RewriteRule ^projects/fla(.*) /activities/ftf$1 [R=301,L]
+RewriteRule ^projects/ms-vs-eu(.*) /activities/ms-vs-eu$1 [R=301,L]
+RewriteRule ^projects/un(.*) /activities/un$1 [R=301,L]
+RewriteRule ^projects/wipo(.*) /activities/wipo$1 [R=301,L]
+RewriteRule ^projects/fp6(.*) /activities/fp6$1 [R=301,L]
+RewriteRule ^projects/fp7(.*) /activities/fp7$1 [R=301,L]
+RewriteRule ^projects/map(.*) /activities/map$1 [R=301,L]
+RewriteRule ^projects/igf(.*) /activities/igf$1 [R=301,L]
+RewriteRule ^projects/work(.*) /work$1 [R=301,L]
+RewriteRule ^projects/leaflet-fellowship-FSA(.*) /about/printable/leaflet-fellowship-FSA$1 [R=301,L]
+RewriteRule ^projects(/.*)?$ / [R=301,L]
+
+# Other pages
+RewriteRule ^about/members(/.*)?$ /about/team$1 [R=301,L]
+RewriteRule ^about/community(/.*)?$ /contact/community.html [R=301,L]
+RewriteRule ^about/self-conception(/.*)?$ /about/principles$1 [R=301,L]
+RewriteRule ^(.*)\.no.html /$1.nb.html [R=301,L]
+RewriteRule ^(.*)\.no.rss /$1.nb.rss [R=301,L]
+RewriteRule ^contact/press(.*) /press/press$1 [R=301,L]
+RewriteRule ^standards(.*) /projects/os$1 [R=301,L]
+RewriteRule ^education(.*) /projects/education$1 [R=301,L]
+RewriteRule ^ftf(.*) /activities/ftf$1 [R=301,L]
+RewriteRule ^stacs(.*) /projects/stacs$1 [R=301,L]
+RewriteRule ^gbn(.*) /projects/gbn$1 [R=301,L]
+RewriteRule ^law/eucd/(.*) /projects/eucd$1 [R=301,L]
+RewriteRule ^law(.*) /projects/law$1 [R=301,L]
+RewriteRule ^swpat(.*) /projects/swpat$1 [R=301,L]
+RewriteRule ^associates/about(.*) /associates/associates$1 [R=301,L]
+RewriteRule ^contribute/traineeship(.*) /contribute/internship$1 [R=301,L]
+RewriteRule ^contribute/donate(.*) /donate$1 [R=301,L]
+RewriteRule ^contact/local(.*) /about/localteams$1 [R=301,L]
+RewriteRule ^fr/(news|events)\.(..\.)?html /fr/fr.$1html [R=301,L]
+RewriteRule ^campaigns/wsis/cs-benchmarks\.(.*)$ /campaigns/wsis/cs-benchmarks-03-11-14.$1 [R=301,L]
+RewriteRule ^freesoftware/education/argumentation(.*)$ /freesoftware/education/education$1 [R=301,L]
+RewriteRule ^contribute/translators\.(.*) /contribute/translators/translators.$1 [R=301,L]
+RewriteRule ^contribute/booth(.*) https://wiki.fsfe.org/KnowHow/Groups/OrganizeABooth [R=301,L]
+
+
+# =============================================================================
+# FELLOWSHIP AND DONATIONS
+# =============================================================================
+
+# Payment
+RewriteRule ^fellowship/paypal(/.*)?$    https://my.fsfe.org/payonline$1 [R=301,L]
+RewriteRule ^fellowship/payonline(/.*)?$ https://my.fsfe.org/payonline$1 [R=301,L]
+RewriteRule ^fellowship/payonline/([^/]*)/(.*)   https://my.fsfe.org/payonline/$2 [R=301,L]
+RewriteRule ^fellowship/login(/.*)?$     https://my.fsfe.org/ [R=301,L]
+RewriteRule ^fellowship/join(/.*)?$      https://my.fsfe.org/support [R=301,L]
+RewriteRule ^fellowship/donate(/.*)?$    https://my.fsfe.org/donate [R=301,L]
+RewriteRule ^fellowship/payment(/.*)?$    https://fsfe.org/donate/payment$1 [R=301,L]
+RewriteRule ^donate/payonline(/.*)?$     https://my.fsfe.org/payonline$1 [R=301,L]
+RewriteRule ^order/payonline.(.*)/(.*) /cgi-bin/order-payonline.pl?language=$1&reference=$2
+
+# Old /fellowship pages
+RewriteRule ^fellowship/card(/.*)?$ https://wiki.fsfe.org/TechDocs/CardHowtos [R=301,L]
+RewriteRule ^fellowship/communicate(/.*)?$ /contact/community.html [R=301,L]
+RewriteRule ^fellowship/contact(/.*)?$ /contact/contact.html [R=301,L]
+RewriteRule ^fellowship/events(.*) https://fsfe.org/events$1 [R=301,L]
+RewriteRule ^fellowship/faq(/.*)?$ https://wiki.fsfe.org/KnowHow/FSFELife/FAQ [R=301,L]
+RewriteRule ^fellowship/graphics/people(/.*)?$ - [L]
+RewriteRule ^fellowship/groups(/.*)?$ https://wiki.fsfe.org/LocalGroups [R=301,L]
+RewriteRule ^fellowship/new-group(/.*)?$ https://wiki.fsfe.org/KnowHow/Groups/CoordinatorsHandbook [R=301,L]
+# Catch the rest
+RewriteRule ^fellowship / [R=301,L]
+
+# Donate
+RewriteRule ^donate(/?|/donate/?|/donate\..*|/donate-.*|/index.*)$ https://my.fsfe.org/donate [R=301,L]
+RewriteRule ^donate(/onetime-donation.*|/spenden.*|/paypal.*)$ https://my.fsfe.org/donate [R=301,L]
+
+# Join/Support
+RewriteRule ^support(er)?(/.*)?$ https://my.fsfe.org/donate [R=301,L]
+RewriteRule ^join(/.*)?$ https://my.fsfe.org/donate [R=301,L]
+RewriteRule ^login(/.*)?$ https://my.fsfe.org/ [R=301,L]
+
+
+# =============================================================================
+# MERCHANDISE / PROMO
+# =============================================================================
+
+# Old pages
+RewriteRule ^about/printable(/.*)?$ /contribute/spreadtheword/ [R=301,L]
+
+
+# =============================================================================
+# MISCELLANEOUS
+# =============================================================================
+
+# Forbid access to these folders
+RewriteRule ^(tools|build)(/.*)?$ - [F,L]
+
+# Custom Directory Index for these folders
+RewriteRule ^campaigns/browserbundling/?$ /campaigns/browserbundling/letter-20091005.html [R=301,L]
diff --git a/about/.htaccess b/about/.htaccess
deleted file mode 100644
index 4973e4897a..0000000000
--- a/about/.htaccess
+++ /dev/null
@@ -1,13 +0,0 @@
-RewriteEngine On
-RewriteRule ^self-conception(.*) /about/principles$1 [redirect=permanent]
-RewriteRule ^nanda /about/weiden [redirect=permanent]
-RewriteRule ^maffulli - [G,L]
-RewriteRule ^jakobs - [G,L]
-RewriteRule ^oriordan - [G,L]
-
-# moved here from ../.htaccess because it was ignored there
-RewriteRule ^basics/gnuproject(.*) /freesoftware/basics/gnuproject$1 [redirect=permanent]   # FIXME
-
-RewriteRule     ^printable/printable(\.[a-z][a-z]\.html)$ /contribute/spreadtheword$1     [redirect=permanent]
-RewriteRule     ^printable/index(\.[a-z][a-z]\.html)$     /contribute/spreadtheword$1     [redirect=permanent]
-RewriteRule     ^printable/(printable|index)?$            /contribute/spreadtheword       [redirect=permanent]
diff --git a/campaigns/browserbundling/.htaccess b/campaigns/browserbundling/.htaccess
deleted file mode 100644
index b269dd7637..0000000000
--- a/campaigns/browserbundling/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-DirectoryIndex letter-20091005.en.html
\ No newline at end of file
diff --git a/campaigns/wsis/.htaccess b/campaigns/wsis/.htaccess
deleted file mode 100644
index 2ad000680c..0000000000
--- a/campaigns/wsis/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RewriteEngine On
-RewriteRule ^cs-benchmarks\.(.*) /projects/wsis/cs-benchmarks-03-11-14.$1 [redirect=permanent]
diff --git a/contribute/.htaccess b/contribute/.htaccess
deleted file mode 100644
index 0bb2650efc..0000000000
--- a/contribute/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-RewriteEngine On
-RewriteRule ^translators\.(.*) /contribute/translators/translators.$1 [redirect=permanent]
-RewriteRule ^booth(.*) http://wiki.fsfe.org/Event_representation [redirect=permanent]
diff --git a/documents/.htaccess b/documents/.htaccess
deleted file mode 100644
index 74b5b5d929..0000000000
--- a/documents/.htaccess
+++ /dev/null
@@ -1,14 +0,0 @@
-RewriteEngine On
-RewriteRule ^fp6(.*) /projects/fp6$1 [redirect=permanent]
-RewriteRule ^whatwedo(.*) /about/basics/whatwedo$1 [redirect=permanent]
-RewriteRule ^gnuproject(.*) /about/basics/gnuproject$1 [redirect=permanent]
-RewriteRule ^whyweexist(.*) /about/basics/whyweexist$1 [redirect=permanent]
-RewriteRule ^freesoftware(.*) /about/basics/freesoftware$1 [redirect=permanent]
-RewriteRule ^preamble(.*) /about/history/preamble$1 [redirect=permanent]
-RewriteRule ^doi(.*) /about/history/doi$1 [redirect=permanent]
-RewriteRule ^msooxml(.*) /projects/os/msooxml$1 [redirect=permanent]
-RewriteRule ^iprip(.*) /projects/wipo/iprip$1 [redirect=permanent]
-RewriteRule ^wiwo(.*) /projects/wipo/wiwo$1 [redirect=permanent]
-RewriteRule ^printable/(.*) /about/printable/$1 [redirect=permanent]
-RewriteRule ^reports/(.*) /about/reports/$1 [redirect=permanent]
-RewriteRule ^rms-fs-2006-03-09(.*) /freesoftware/transcripts/rms-fs-2006-03-09$1 [redirect=permanent]
diff --git a/donate/.htaccess b/donate/.htaccess
deleted file mode 100644
index 02eb843ec1..0000000000
--- a/donate/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-RewriteEngine On
-RewriteRule ^donate-2002\.(.*) /donate/donate.$1 [redirect=permanent]
-RewriteRule ^spenden(.*) /donate/donate$1 [redirect=permanent]
-RewriteRule ^paypal(.*) /donate/donate$1 [redirect=permanent]
-RewriteRule ^donate-2004-uk(.*) /donate/donate$1 [redirect=permanent]
-RewriteRule ^donate-2002-de(.*) /donate/germany$1 [redirect=permanent]
-RewriteRule ^donate-2007-ch(.*) /donate/switzerland$1 [redirect=permanent]
-RewriteRule ^onetime-donation(.*) /fellowship/donate$1 [redirect=permanent]
diff --git a/fr/.htaccess b/fr/.htaccess
deleted file mode 100644
index e57b4d3bff..0000000000
--- a/fr/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-RewriteEngine	On
-
-RewriteRule ^news\.html		/fr/fr.html	[redirect=permanent]
-RewriteRule ^events\.html	/fr/fr.html	[redirect=permanent]
-RewriteRule ^news\.(..)\.html	/fr/fr.$1.html	[redirect=permanent]
-RewriteRule ^events\.(..)\.html	/fr/fr.$1.html	[redirect=permanent]
-
diff --git a/freesoftware/education/.htaccess b/freesoftware/education/.htaccess
deleted file mode 100644
index 058e3edc5f..0000000000
--- a/freesoftware/education/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-RewriteEngine On
-RewriteRule ^argumentation(.*) /freesoftware/education/education$1 [redirect=permanent]
-
diff --git a/order/.htaccess b/order/.htaccess
deleted file mode 100644
index 7fabffe48a..0000000000
--- a/order/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-RewriteEngine On
-RewriteRule ^payonline.(.*)/(.*) /cgi-bin/order-payonline.pl?language=$1&reference=$2
diff --git a/projects/.htaccess b/projects/.htaccess
deleted file mode 100644
index b30de95ec3..0000000000
--- a/projects/.htaccess
+++ /dev/null
@@ -1,55 +0,0 @@
-RewriteEngine On
-
-# TODO: The following rules must be fixed (the /projects/work directory doesn't exist)
-RewriteRule ^community(.*) /projects/work$1 [redirect=permanent]
-RewriteRule ^legal(.*) /projects/work$1 [redirect=permanent]
-RewriteRule ^other(.*) /projects/work$1 [redirect=permanent]
-RewriteRule ^technical(.*) /projects/work$1 [redirect=permanent]
-
-# The following projects were moved to the /campaigns section
-#
-# RewriteRule ^PROJECTNAME(.*)         /campaigns/PROJECTNAME$1 [redirect=permanent]
-RewriteRule ^agnula(.*)                /campaigns/agnula$1 [redirect=permanent]
-RewriteRule ^bgw(.*)                   /campaigns/bgw$1 [redirect=permanent]
-RewriteRule ^browserbundling(.*)       /campaigns/browserbundling$1 [redirect=permanent]
-RewriteRule ^btw09(.*)                 /campaigns/btw09$1 [redirect=permanent]
-RewriteRule ^eucd(.*)                  /campaigns/eucd$1 [redirect=permanent]
-RewriteRule ^gbn(.*)                   /campaigns/gbn$1 [redirect=permanent]
-RewriteRule ^gplv3(.*)                 /campaigns/gplv3$1 [redirect=permanent]
-RewriteRule ^horizon2020(.*)           /campaigns/horizon2020$1 [redirect=permanent]
-RewriteRule ^ipred2(.*)                /campaigns/ipred2$1 [redirect=permanent]
-RewriteRule ^mankind(.*)               /campaigns/mankind$1 [redirect=permanent]
-RewriteRule ^pdfreaders(.*)            /campaigns/pdfreaders$1 [redirect=permanent]
-RewriteRule ^self(.*)                  /campaigns/self$1 [redirect=permanent]
-RewriteRule ^stacs(.*)                 /campaigns/stacs$1 [redirect=permanent]
-RewriteRule ^swpat(.*)                 /campaigns/swpat$1 [redirect=permanent]
-RewriteRule ^wsis(.*)                  /campaigns/wsis$1 [redirect=permanent]
-RewriteRule ^active(.*)html$           /campaigns/campaigns$1html [redirect=permanent]
-RewriteRule ^finished(.*)html$         /campaigns/campaigns$1html [redirect=permanent]
-RewriteRule ^inactive(.*)html$         /campaigns/campaigns$1html [redirect=permanent]
-
-
-# The following projects were moved to the /activities section
-#
-# RewriteRule ^PROJECTNAME(.*)        /activities/PROJECTNAME$1 [redirect=permanent]
-RewriteRule ^drm(.*)                  /activities/drm$1 [redirect=permanent]
-RewriteRule ^education(.*)            /activities/education$1 [redirect=permanent]
-RewriteRule ^os(.*)                   /activities/os$1 [redirect=permanent]
-RewriteRule ^procurement(.*)          /activities/procurement$1 [redirect=permanent]
-RewriteRule ^eu(.*)                   /activities/eu$1 [redirect=permanent]
-RewriteRule ^ftf(.*)                  /activities/ftf$1 [redirect=permanent]
-RewriteRule ^fla(.*)                  /activities/ftf$1 [redirect=permanent]
-RewriteRule ^ms-vs-eu(.*)             /activities/ms-vs-eu$1 [redirect=permanent]
-RewriteRule ^un(.*)                   /activities/un$1 [redirect=permanent]
-RewriteRule ^wipo(.*)                 /activities/wipo$1 [redirect=permanent]
-RewriteRule ^fp6(.*)                  /activities/fp6$1 [redirect=permanent]
-RewriteRule ^fp7(.*)                  /activities/fp7$1 [redirect=permanent]
-RewriteRule ^map(.*)                  /activities/map$1 [redirect=permanent]
-RewriteRule ^igf(.*)                  /activities/igf$1 [redirect=permanent]
-
-
-# The following projects were moved somewhere else
-#
-RewriteRule ^projects(.*)html(.*)     /projects$1html$2 [redirect=permanent]
-RewriteRule ^work(.*)html(.*)         /work$1html$2 [redirect=permanent]
-RewriteRule ^leaflet-fellowship-FSA(.*)html(.*) /about/printable/leaflet-fellowship-FSA$1html$2 [redirect=permanent]
diff --git a/tags/.htaccess b/tags/.htaccess
deleted file mode 100644
index 1f1d31a43e..0000000000
--- a/tags/.htaccess
+++ /dev/null
@@ -1,5 +0,0 @@
-RewriteEngine	On
-
-RewriteRule ^tagged\.html	/tags/tags.html		[redirect=permanent]
-RewriteRule ^tagged\.(..)\.html	/tags/tags.$1.html	[redirect=permanent]
-
diff --git a/tools/.htaccess b/tools/.htaccess
deleted file mode 100644
index 0d17541748..0000000000
--- a/tools/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-Deny From All
-