diff --git a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
index 0c40d8a1..8da249db 100644
--- a/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
+++ b/libkcddb/kcmcddb/cddbconfigwidgetbase.ui
@@ -212,7 +212,7 @@
                                     </sizepolicy>
                                 </property>
                                 <property name="text">
-                                    <string>freedb.freedb.org</string>
+                                    <string>gnudb.gnudb.org</string>
                                 </property>
                                 <property name="whatsThis" stdset="0">
                                     <string>Name of CDDB server which will be used to look up CD information.</string>
diff --git a/libkcddb/libkcddb.kcfg b/libkcddb/libkcddb.kcfg
index 938ac306..54ee70ad 100644
--- a/libkcddb/libkcddb.kcfg
+++ b/libkcddb/libkcddb.kcfg
@@ -7,7 +7,7 @@
   <kcfgfile name="kcmcddbrc"/>
   <group name="Lookup">
     <entry name="hostname" type="String">
-      <default>freedb.freedb.org</default>
+      <default>gnudb.gnudb.org</default>
     </entry>
     <entry name="port" type="Int">
       <default>80</default>
@@ -42,7 +42,7 @@
     <entry name="emailAddress" type="String">
     </entry>
     <entry name="httpSubmitServer" type="String">
-      <default>freedb.freedb.org</default>
+      <default>gnudb.gnudb.org</default>
     </entry>
     <entry name="httpSubmitPort" type="Int">
       <default>80</default>
diff --git a/libkcddb/sites.cpp b/libkcddb/sites.cpp
index 56cc5eb6..200ad6b1 100644
--- a/libkcddb/sites.cpp
+++ b/libkcddb/sites.cpp
@@ -37,7 +37,7 @@ namespace KCDDB
   {
     KURL url;
     url.setProtocol( "http" );
-    url.setHost( "freedb.freedb.org" );
+    url.setHost( "gnudb.gnudb.org" );
     url.setPort( 80 );
     url.setPath( "/~cddb/cddb.cgi" );
 
diff --git a/libkcddb/test/asynccddblookuptest.cpp b/libkcddb/test/asynccddblookuptest.cpp
index 9699f54f..e9100c40 100644
--- a/libkcddb/test/asynccddblookuptest.cpp
+++ b/libkcddb/test/asynccddblookuptest.cpp
@@ -13,7 +13,7 @@ AsyncCDDBLookupTest::AsyncCDDBLookupTest()
   using namespace KCDDB;
 
   client_ = new Client;
-  client_->config().setHostname("freedb.freedb.org");
+  client_->config().setHostname("gnudb.gnudb.org");
   client_->config().setPort(8880);
   client_->config().setCachePolicy(Cache::Ignore);
   client_->config().setLookupTransport(Lookup::CDDBP);
diff --git a/libkcddb/test/asynchttplookuptest.cpp b/libkcddb/test/asynchttplookuptest.cpp
index 3cba7d7b..045e6b15 100644
--- a/libkcddb/test/asynchttplookuptest.cpp
+++ b/libkcddb/test/asynchttplookuptest.cpp
@@ -12,7 +12,7 @@ AsyncHTTPLookupTest::AsyncHTTPLookupTest()
   using namespace KCDDB;
 
   client_ = new Client;
-  client_->config().setHostname("freedb.freedb.org");
+  client_->config().setHostname("gnudb.gnudb.org");
   client_->config().setPort(80);
   client_->config().setCachePolicy(Cache::Ignore);
   client_->config().setLookupTransport(Lookup::HTTP);
diff --git a/libkcddb/test/synccddblookuptest.cpp b/libkcddb/test/synccddblookuptest.cpp
index c2c86618..b308cbef 100644
--- a/libkcddb/test/synccddblookuptest.cpp
+++ b/libkcddb/test/synccddblookuptest.cpp
@@ -17,7 +17,7 @@ main(int argc, char ** argv)
   using namespace KCDDB;
 
   Client c;
-  c.config().setHostname("freedb.freedb.org");
+  c.config().setHostname("gnudb.gnudb.org");
   c.config().setPort(8880);
   c.config().setCachePolicy(Cache::Ignore);
   c.config().setLookupTransport(Lookup::CDDBP);
diff --git a/libkcddb/test/synchttplookuptest.cpp b/libkcddb/test/synchttplookuptest.cpp
index 15e76ee8..74ec6bb3 100644
--- a/libkcddb/test/synchttplookuptest.cpp
+++ b/libkcddb/test/synchttplookuptest.cpp
@@ -16,7 +16,7 @@ main(int argc, char ** argv)
   using namespace KCDDB;
 
   Client c;
-  c.config().setHostname("freedb.freedb.org");
+  c.config().setHostname("gnudb.gnudb.org");
   c.config().setPort(80);
   c.config().setCachePolicy(Cache::Ignore);
   c.config().setLookupTransport(Lookup::HTTP);