diff --git a/FAQ.php b/FAQ.php
index 4df3dc7..deef103 100644
--- a/FAQ.php
+++ b/FAQ.php
@@ -1471,7 +1471,7 @@ If you get an error such as sh: /dev/console: Permission denied, login as root,
 <A name="100"></A>
 <h2>5.5 &nbsp;Where can I get more dockapps?</h2>
 The Window Maker team got tired of people E-mailing constantly asking where the websites for obscure dockapps disappeared to.  So we've created the ultimate dockapps community website.
-Visit <a href="http://dockapps.org/">dockapps.org</a> for the latest, up-to-date links, information, and download for Window Maker and related dockapps.
+Visit <a href="http://windowmaker.org/dockapps">windowmaker.org/dockapps</a> for the latest, up-to-date links, information, and download for Window Maker and related dockapps.
 <P>
 Another large index of dockapp links is available at <A HREF="http://www.bensinclair.com/dockapp">http://www.bensinclair.com/dockapp</A> .  The downside to this is that they're only links, so if someone stops maintaining a dockapp, or their web hosting provider cuts them off, you won't be able to get to it.  Still, Ben Sinclair's site was the first big "dockapp warehouse" site, so we give credit where credit is due. :)
 
diff --git a/docs.php b/docs.php
index 5f9fd3b..9cc6255 100644
--- a/docs.php
+++ b/docs.php
@@ -50,12 +50,12 @@
 	<h2> Can I easily mount my external drives or connect to the internet with Window Maker?</h2>
 	<p> Yes, you can. Mounting external media is not the problem of a window manager to solve, but
 	a tipical Window Maker user can mount external media just as easily as any other desktop user.
-	If you use a dockapp like <a href="http://dockapps.windowmaker.org/file.php/id/275">wmvolman</a> or 
-	<a href="http://dockapps.windowmaker.org/file.php/id/357">wmudmount</a> you are just a click away from
+	If you use a dockapp like <a href="https://github.com/raorn/wmvolman">wmvolman</a> or
+	<a href="http://sourceforge.net/projects/wmudmount">wmudmount</a> you are just a click away from
 	having your external media mounted on /media/VOLUME_LABEL.</p>
 
        	<p> And you can just as easily manage your network connections using the standard <code>nm-applet</code> running
-	in a system tray like <a href="http://dockapps.windowmaker.org/file.php/id/355">wmsystemtray</a> on your dock.</p>
+	in a system tray like <a href="http://sourceforge.net/projects/wmsystemtray">wmsystemtray</a> on your dock.</p>
 
 	<div align="center"><img src="essential_dockapps.png" alt="Essential dockapps" width="66" height="135" /><div>wmvolman and wmsystemtray with nm-applet</div></div>
 
diff --git a/home.php b/home.php
index 5984acf..84fda27 100644
--- a/home.php
+++ b/home.php
@@ -28,7 +28,7 @@
 
           <p>Window Maker has a stable user interface since many years and comes with a powerful GUI configuration editor called
           WPrefs, which removes the need to edit text-based config files by hand. It supports running <a href=
-          "http://dockapps.windowmaker.org">dockapps</a> which make everyday tasks such as monitoring system performance and
+          "http://windowmaker.org/dockapps">dockapps</a> which make everyday tasks such as monitoring system performance and
           battery usage, mounting devices or connecting to the internet very easy. Please see the <a href=
           "features.php">features</a> section for more specifics on what Window Maker can do, and how it compares with other
           popular window managers.</p>
diff --git a/installation.php b/installation.php
index 991f001..dda98be 100644
--- a/installation.php
+++ b/installation.php
@@ -109,7 +109,7 @@
        
 
 	<p> Another recommended step is to install a few dockapps like wmvolman, wmmixer and wmsystemtray which allow one to
-	easily mount external media on /media among other things. Visit <a href="http://dockapps.windowmaker.org"> dockapps</a>
+	easily mount external media on /media among other things. Visit <a href="http://windowmaker.org/dockapps">dockapps</a>
 	for many more choices.</p>
 
 	<br><br><br>