diff --git a/CMakeLists.txt b/CMakeLists.txt
index e97ef57e0..b2ac71afc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1064,7 +1064,7 @@ add_subdirectory( tdestyles )
 add_subdirectory( libtdemid )
 add_subdirectory( libtdescreensaver )
 add_subdirectory( networkstatus )
-add_subdirectory( knewstuff )
+add_subdirectory( tdenewstuff )
 add_subdirectory( tdersync )
 add_subdirectory( licenses )
 add_subdirectory( dnssd )
diff --git a/Mainpage.dox b/Mainpage.dox
index 77bdc19b1..bef552af1 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -61,8 +61,8 @@
 	* - <a target="_top" href="arts/html/index.html"><b>arts</b></a>
         *   (<a target="_top" href="arts/html/classes.html">classes</a>)\n
 	*   <i>Trinity bindings for arts including knotify.</i>
-	* - <a target="_top" href="knewstuff/html/index.html"><b>knewstuff</b></a>
-        *   (<a target="_top" href="knewstuff/html/classes.html">classes</a>)\n
+	* - <a target="_top" href="tdenewstuff/html/index.html"><b>tdenewstuff</b></a>
+        *   (<a target="_top" href="tdenewstuff/html/classes.html">classes</a>)\n
 	*   <i>Upload and download of application data.</i>
 	* - <a target="_top" href="dnssd/html/index.html"><b>dnssd</b></a>
         *   (<a target="_top" href="dnssd/html/classes.html">classes</a>)\n
diff --git a/configure.in.in b/configure.in.in
index 16b63b68c..83a6b5181 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -259,7 +259,7 @@ AC_SUBST(LIB_TDEHTML, '$(top_builddir)/tdehtml/libtdehtml.la')
 AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
 AC_SUBST(LIB_TDEPARTS, '$(top_builddir)/tdeparts/libtdeparts.la')
 AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la')
-AC_SUBST(LIB_KNEWSTUFF, '$(top_builddir)/knewstuff/libknewstuff.la')
+AC_SUBST(LIB_TDENEWSTUFF, '$(top_builddir)/tdenewstuff/libtdenewstuff.la')
 AC_SUBST(LIB_TDEUNITTEST, '$(top_builddir)/tdeunittest/libtdeunittest.la')
 case $host in 
 	*cygwin*) lib_kded='$(top_builddir)/kded/libtdeinit_kded.la' ;;
diff --git a/knewstuff/CMakeLists.txt b/tdenewstuff/CMakeLists.txt
similarity index 87%
rename from knewstuff/CMakeLists.txt
rename to tdenewstuff/CMakeLists.txt
index 4493ee385..0633603f8 100644
--- a/knewstuff/CMakeLists.txt
+++ b/tdenewstuff/CMakeLists.txt
@@ -32,19 +32,19 @@ install( FILES
     downloaddialog.h engine.h entry.h knewstuffgeneric.h
     knewstuff.h providerdialog.h provider.h uploaddialog.h
     knewstuffbutton.h knewstuffsecure.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/knewstuff )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdenewstuff )
 
 
 ##### other data ################################
 
-install( FILES types DESTINATION ${DATA_INSTALL_DIR}/knewstuff )
+install( FILES types DESTINATION ${DATA_INSTALL_DIR}/tdenewstuff )
 install( FILES tdehotnewstuffrc DESTINATION ${CONFIG_INSTALL_DIR} )
 tde_install_icons( )
 
 
-##### knewstuff #################################
+##### tdenewstuff ###############################
 
-set( target knewstuff )
+set( target tdenewstuff )
 
 set( ${target}_SRCS
   engine.cpp entry.cpp downloaddialog.cpp uploaddialog.cpp
@@ -70,6 +70,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK knewstuff-shared
+  LINK tdenewstuff-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/knewstuff/Mainpage.dox b/tdenewstuff/Mainpage.dox
similarity index 100%
rename from knewstuff/Mainpage.dox
rename to tdenewstuff/Mainpage.dox
diff --git a/knewstuff/Makefile.am b/tdenewstuff/Makefile.am
similarity index 100%
rename from knewstuff/Makefile.am
rename to tdenewstuff/Makefile.am
diff --git a/knewstuff/README.knewstuff b/tdenewstuff/README.knewstuff
similarity index 100%
rename from knewstuff/README.knewstuff
rename to tdenewstuff/README.knewstuff
diff --git a/knewstuff/cr16-action-knewstuff.png b/tdenewstuff/cr16-action-knewstuff.png
similarity index 100%
rename from knewstuff/cr16-action-knewstuff.png
rename to tdenewstuff/cr16-action-knewstuff.png
diff --git a/knewstuff/cr32-action-knewstuff.png b/tdenewstuff/cr32-action-knewstuff.png
similarity index 100%
rename from knewstuff/cr32-action-knewstuff.png
rename to tdenewstuff/cr32-action-knewstuff.png
diff --git a/knewstuff/cr64-action-knewstuff.png b/tdenewstuff/cr64-action-knewstuff.png
similarity index 100%
rename from knewstuff/cr64-action-knewstuff.png
rename to tdenewstuff/cr64-action-knewstuff.png
diff --git a/knewstuff/downloaddialog.cpp b/tdenewstuff/downloaddialog.cpp
similarity index 98%
rename from knewstuff/downloaddialog.cpp
rename to tdenewstuff/downloaddialog.cpp
index 4a3c56ff4..586fb76b7 100644
--- a/knewstuff/downloaddialog.cpp
+++ b/tdenewstuff/downloaddialog.cpp
@@ -33,9 +33,9 @@
 #include <tdeapplication.h>
 #include <kiconloader.h>
 
-#include <knewstuff/entry.h>
-#include <knewstuff/knewstuffgeneric.h>
-#include <knewstuff/engine.h>
+#include <tdenewstuff/entry.h>
+#include <tdenewstuff/knewstuffgeneric.h>
+#include <tdenewstuff/engine.h>
 
 #include <tqlayout.h>
 #include <tqpushbutton.h>
@@ -531,6 +531,13 @@ void DownloadDialog::slotInstall()
   Entry *e = getEntry();
   if(!e) return;
 
+  TQPushButton *de, *in;
+  in = *(m_buttons[d->m_page]->at(0));
+  de = *(m_buttons[d->m_page]->at(1));
+
+  if(in) in->setEnabled(false);
+  if(de) de->setEnabled(false);
+
   d->m_lvtmp_r->setEnabled( false );
   d->m_lvtmp_l->setEnabled( false );
   d->m_lvtmp_d->setEnabled( false );
diff --git a/knewstuff/downloaddialog.h b/tdenewstuff/downloaddialog.h
similarity index 99%
rename from knewstuff/downloaddialog.h
rename to tdenewstuff/downloaddialog.h
index 2c74e21f3..5756a4e6e 100644
--- a/knewstuff/downloaddialog.h
+++ b/tdenewstuff/downloaddialog.h
@@ -21,7 +21,7 @@
 #define KNEWSTUFF_DOWNLOADDIALOG_H
 
 #include <kdialogbase.h>
-#include <knewstuff/provider.h>
+#include <tdenewstuff/provider.h>
 
 namespace TDEIO
 {
diff --git a/knewstuff/engine.cpp b/tdenewstuff/engine.cpp
similarity index 100%
rename from knewstuff/engine.cpp
rename to tdenewstuff/engine.cpp
diff --git a/knewstuff/engine.h b/tdenewstuff/engine.h
similarity index 100%
rename from knewstuff/engine.h
rename to tdenewstuff/engine.h
diff --git a/knewstuff/entry.cpp b/tdenewstuff/entry.cpp
similarity index 100%
rename from knewstuff/entry.cpp
rename to tdenewstuff/entry.cpp
diff --git a/knewstuff/entry.h b/tdenewstuff/entry.h
similarity index 100%
rename from knewstuff/entry.h
rename to tdenewstuff/entry.h
diff --git a/knewstuff/ghns.cpp b/tdenewstuff/ghns.cpp
similarity index 100%
rename from knewstuff/ghns.cpp
rename to tdenewstuff/ghns.cpp
diff --git a/knewstuff/ghns.h b/tdenewstuff/ghns.h
similarity index 100%
rename from knewstuff/ghns.h
rename to tdenewstuff/ghns.h
diff --git a/knewstuff/knewstuff.cpp b/tdenewstuff/knewstuff.cpp
similarity index 100%
rename from knewstuff/knewstuff.cpp
rename to tdenewstuff/knewstuff.cpp
diff --git a/knewstuff/knewstuff.h b/tdenewstuff/knewstuff.h
similarity index 100%
rename from knewstuff/knewstuff.h
rename to tdenewstuff/knewstuff.h
diff --git a/knewstuff/knewstuffbutton.cpp b/tdenewstuff/knewstuffbutton.cpp
similarity index 100%
rename from knewstuff/knewstuffbutton.cpp
rename to tdenewstuff/knewstuffbutton.cpp
diff --git a/knewstuff/knewstuffbutton.h b/tdenewstuff/knewstuffbutton.h
similarity index 100%
rename from knewstuff/knewstuffbutton.h
rename to tdenewstuff/knewstuffbutton.h
diff --git a/knewstuff/knewstuffgeneric.cpp b/tdenewstuff/knewstuffgeneric.cpp
similarity index 100%
rename from knewstuff/knewstuffgeneric.cpp
rename to tdenewstuff/knewstuffgeneric.cpp
diff --git a/knewstuff/knewstuffgeneric.h b/tdenewstuff/knewstuffgeneric.h
similarity index 100%
rename from knewstuff/knewstuffgeneric.h
rename to tdenewstuff/knewstuffgeneric.h
diff --git a/knewstuff/knewstuffsecure.cpp b/tdenewstuff/knewstuffsecure.cpp
similarity index 100%
rename from knewstuff/knewstuffsecure.cpp
rename to tdenewstuff/knewstuffsecure.cpp
diff --git a/knewstuff/knewstuffsecure.h b/tdenewstuff/knewstuffsecure.h
similarity index 100%
rename from knewstuff/knewstuffsecure.h
rename to tdenewstuff/knewstuffsecure.h
diff --git a/knewstuff/provider.cpp b/tdenewstuff/provider.cpp
similarity index 98%
rename from knewstuff/provider.cpp
rename to tdenewstuff/provider.cpp
index 029a07caf..4157c5025 100644
--- a/knewstuff/provider.cpp
+++ b/tdenewstuff/provider.cpp
@@ -352,9 +352,9 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList )
   if ( providersUrl.isEmpty() ) {
     // TODO: Replace the default by the real one.
     TQString server = cfg->readEntry( "MasterServer",
-                                     "http://korganizer.kde.org" );
+                                     "https://www.trinitydesktop.org" );
   
-    providersUrl = server + "/knewstuff/" + type + "/providers.xml";
+    providersUrl = server + "/ocs/" + type + "/providers.xml";
   }
 
   kdDebug() << "ProviderLoader::load(): providersUrl: " << providersUrl << endl;
diff --git a/knewstuff/provider.h b/tdenewstuff/provider.h
similarity index 100%
rename from knewstuff/provider.h
rename to tdenewstuff/provider.h
diff --git a/knewstuff/providerdialog.cpp b/tdenewstuff/providerdialog.cpp
similarity index 100%
rename from knewstuff/providerdialog.cpp
rename to tdenewstuff/providerdialog.cpp
diff --git a/knewstuff/providerdialog.h b/tdenewstuff/providerdialog.h
similarity index 100%
rename from knewstuff/providerdialog.h
rename to tdenewstuff/providerdialog.h
diff --git a/knewstuff/security.cpp b/tdenewstuff/security.cpp
similarity index 100%
rename from knewstuff/security.cpp
rename to tdenewstuff/security.cpp
diff --git a/knewstuff/security.h b/tdenewstuff/security.h
similarity index 100%
rename from knewstuff/security.h
rename to tdenewstuff/security.h
diff --git a/knewstuff/tdehotnewstuff.cpp b/tdenewstuff/tdehotnewstuff.cpp
similarity index 100%
rename from knewstuff/tdehotnewstuff.cpp
rename to tdenewstuff/tdehotnewstuff.cpp
diff --git a/knewstuff/tdehotnewstuffrc b/tdenewstuff/tdehotnewstuffrc
similarity index 100%
rename from knewstuff/tdehotnewstuffrc
rename to tdenewstuff/tdehotnewstuffrc
diff --git a/knewstuff/testnewstuff.cpp b/tdenewstuff/testnewstuff.cpp
similarity index 100%
rename from knewstuff/testnewstuff.cpp
rename to tdenewstuff/testnewstuff.cpp
diff --git a/knewstuff/testnewstuff.h b/tdenewstuff/testnewstuff.h
similarity index 100%
rename from knewstuff/testnewstuff.h
rename to tdenewstuff/testnewstuff.h
diff --git a/knewstuff/types b/tdenewstuff/types
similarity index 100%
rename from knewstuff/types
rename to tdenewstuff/types
diff --git a/knewstuff/uploaddialog.cpp b/tdenewstuff/uploaddialog.cpp
similarity index 100%
rename from knewstuff/uploaddialog.cpp
rename to tdenewstuff/uploaddialog.cpp
diff --git a/knewstuff/uploaddialog.h b/tdenewstuff/uploaddialog.h
similarity index 100%
rename from knewstuff/uploaddialog.h
rename to tdenewstuff/uploaddialog.h