diff --git a/doc/scripts/tdesvn-build/index.docbook b/doc/scripts/tdesvn-build/index.docbook
index e3026fcc..c14eccb4 100644
--- a/doc/scripts/tdesvn-build/index.docbook
+++ b/doc/scripts/tdesvn-build/index.docbook
@@ -189,12 +189,12 @@ a mirror close to you</ulink>.
 </para>
 
 <para>
-Pay close attention to the kdedir and qtdir global variables, as the first sets
+Pay close attention to the tdedir and qtdir global variables, as the first sets
 where your &kde; build is going to be installed, (by default to
 <filename>~/kde</filename>), and the second where (and if) your qt library is
 going to be built and installed, (by default to
 <filename>~/tdesvn/build/qt-copy</filename>). You will need to know the
-kdedir and qtdir location later, to set up the environment variables
+tdedir and qtdir location later, to set up the environment variables
 that are necessary to run your new installation.
 Check if the listed modules are in fact the modules you want to build.
 The default options from the <filename>tdesvn-buildrc-sample</filename> file
@@ -254,7 +254,7 @@ Open or create the <filename>.bash_profile</filename> file in the home directory
 and add to the end of the file:
 
 <programlisting>
-TDEDIR=(path to kdedir)
+TDEDIR=(path to tdedir)
 TDEDIRS=$TDEDIR
 PATH=$TDEDIR/bin:$QTDIR/bin:$PATH
 LD_LIBRARY_PATH=$TDEDIR/lib:$LD_LIBRARY_PATH
@@ -265,7 +265,7 @@ If you are building the qt-copy module, add instead:
 
 <programlisting>
 QTDIR=(path to qtdir)
-TDEDIR=(path to kdedir)
+TDEDIR=(path to tdedir)
 TDEDIRS=$TDEDIR
 PATH=$TDEDIR/bin:$QTDIR/bin:$PATH
 MANPATH=$QTDIR/doc/man:$MANPATH
@@ -557,7 +557,7 @@ authors using the address you can find <link linkend="authors">above</link>.
 <listitem><para><link linkend="conf-do-not-compile">do-not-compile</link>, to mark directories to skip building.</para></listitem>
 <listitem><para><link linkend="conf-inst-apps">inst-apps</link>, to only build and install some directories.</para></listitem>
 <listitem><para><link linkend="conf-install-after-build">install-after-build</link>, to avoid installing after the build process.</para></listitem>
-<listitem><para><link linkend="conf-kdedir">kdedir</link>, to set the directory to install KDE to.</para></listitem>
+<listitem><para><link linkend="conf-tdedir">tdedir</link>, to set the directory to install KDE to.</para></listitem>
 <listitem><para><link linkend="conf-libpath">libpath</link>, to set the <envar>LD_LIBRARY_PATH</envar> variable.</para></listitem>
 <listitem><para><link linkend="conf-make-install-prefix">make-install-prefix</link>, to run a helper program (like sudo) during make install.</para></listitem>
 <listitem><para><link linkend="conf-make-options">make-options</link>, to pass options to the make program.</para></listitem>
@@ -814,8 +814,8 @@ set this option to 0 in the configuration file.  You can also use the
 </entry>
 </row>
 
-<row id="conf-kdedir">
-<entry>kdedir</entry>
+<row id="conf-tdedir">
+<entry>tdedir</entry>
 <entry>Can't be overridden</entry>
 <entry>This option sets the directory that &kde; will be installed to after it is
 built.  It defaults to <filename class="directory">~/kde</filename>.  If you change this to a directory
diff --git a/scripts/tdesvn-build b/scripts/tdesvn-build
index 99911ece..73951a0f 100755
--- a/scripts/tdesvn-build
+++ b/scripts/tdesvn-build
@@ -118,7 +118,7 @@ Allow you to run the script with a lower priority. The default value is
 
 =item B<--prefix=/kde/path>
 
-This option is a shortcut to change the setting for kdedir from the
+This option is a shortcut to change the setting for tdedir from the
 command line. It implies B<--reconfigure>.
 
 =item B<--color>
@@ -300,7 +300,7 @@ my %package_opts = (
     "email-on-compile-error" => "",
     "install-after-build" => "1", # Default to true
     "inst-apps"           => "",
-    "kdedir"              => "$ENV{HOME}/kde",
+    "tdedir"              => "$ENV{HOME}/kde",
     "libpath"             => "",
     "log-dir"             => "log",
     "make-install-prefix" => "",  # Some people need sudo
@@ -786,7 +786,7 @@ sub get_option
     my $option = shift;
     my $global_opts = $package_opts{'global'};
     my $defaultQtCopyArgs = '-qt-gif -plugin-imgfmt-mng -thread -no-exceptions -debug -dlopen-opengl -plugin-sql-sqlite';
-    my @lockedOpts = qw(source-dir svn-server qtdir libpath binpath kdedir
+    my @lockedOpts = qw(source-dir svn-server qtdir libpath binpath tdedir
                         pretend disable-agent-check);
 
     # These options can't override globals
@@ -1677,7 +1677,7 @@ sub initialize_environment
 
     my $svnserver = get_option ('global', 'svn-server');
 
-    my $pc_path = get_option('global', 'kdedir') . "/lib/pkgconfig";
+    my $pc_path = get_option('global', 'tdedir') . "/lib/pkgconfig";
     $pc_path .= ":" . $ENV{'PKG_CONFIG_PATH'} if ( exists $ENV{'PKG_CONFIG_PATH'} );
     $ENV{'PKG_CONFIG_PATH'} = $pc_path;
 
@@ -1932,7 +1932,7 @@ Options:
     --nice=<value>       Allows you to run the script with a lower priority
                          The default value is 10 (lower priority by 10 steps).
     --prefix=/kde/path   This option is a shortcut to change the setting for
-                         kdedir from the command line.  It implies
+                         tdedir from the command line.  It implies
                          --reconfigure.
 
     --resume             Tries to resume the make process from the last time
@@ -2075,7 +2075,7 @@ DONE
                     exit 8;
                 }
 
-                set_option('global', '#kdedir', $prefix);
+                set_option('global', '#tdedir', $prefix);
                 set_option('global', '#reconfigure', 1);
 
                 last SWITCH;
@@ -2798,10 +2798,10 @@ sub safe_configure
 
     if ($module ne 'qt-copy')
     {
-        my $kdedir = get_option ('global', 'kdedir');
+        my $tdedir = get_option ('global', 'tdedir');
         my $prefix = get_option ($module, 'prefix');
 
-        $prefix = $kdedir unless $prefix;
+        $prefix = $tdedir unless $prefix;
 
         push @commands, "CXXFLAGS=$cxxflags" if $cxxflags;
         push @commands, "--prefix=$prefix";
@@ -3427,10 +3427,10 @@ sub setup_build_system
 sub update_module_environment
 {
     my $module = shift;
-    my $kdedir = get_option ($module, 'kdedir');
+    my $tdedir = get_option ($module, 'tdedir');
     my $qtdir = get_option ($module, 'qtdir');
-    my $path = join(':', "$qtdir/bin", "$kdedir/bin", get_option ($module, 'binpath'));
-    my $libdir = join(':', "$qtdir/lib", "$kdedir/lib", get_option ($module, 'libpath'));
+    my $path = join(':', "$qtdir/bin", "$tdedir/bin", get_option ($module, 'binpath'));
+    my $libdir = join(':', "$qtdir/lib", "$tdedir/lib", get_option ($module, 'libpath'));
 
     # Set up the tqchildren's environment.  We use setenv since it
     # won't set an environment variable to nothing.  (e.g, setting
@@ -3461,7 +3461,7 @@ sub update_module_environment
 
     setenv ('LD_LIBRARY_PATH', $libdir);
     setenv ('PATH', $path);
-    setenv ('TDEDIR', $kdedir);
+    setenv ('TDEDIR', $tdedir);
     setenv ('QTDIR', $qtdir);
 
     # Qt has several defines of its own.  Special case qt-copy for this
diff --git a/scripts/tdesvn-buildrc-sample b/scripts/tdesvn-buildrc-sample
index f39ae662..c54bb18f 100644
--- a/scripts/tdesvn-buildrc-sample
+++ b/scripts/tdesvn-buildrc-sample
@@ -65,7 +65,7 @@ global
 # permissions.  If you'd like, you can install and use the sudo program to
 # install KDE anywhere on your system, in conjunction with the
 # make-install-prefix option.
-#	kdedir ~/kde
+#	tdedir ~/kde
 #
 # You can overwrite the installation directory for a given module using
 # the per-module "prefix" option. Note that when doing this you need to
diff --git a/scripts/tdesvn-buildrc.xml b/scripts/tdesvn-buildrc.xml
index 547950d3..887e87f6 100644
--- a/scripts/tdesvn-buildrc.xml
+++ b/scripts/tdesvn-buildrc.xml
@@ -55,7 +55,7 @@
       <item>email-on-compile-error</item>
       <item>install-after-build</item>
       <item>inst-apps</item>
-      <item>kdedir</item>
+      <item>tdedir</item>
       <item>libpath</item>
       <item>log-dir</item>
       <item>make-install-prefix</item>