diff --git a/README b/README
index fac5085d3d6..2f5036ce56b 100644
--- a/README
+++ b/README
@@ -142,7 +142,7 @@ The file documentation/samples/config contains an example configuration file
 which has to be adapted and copied to the location mentioned above.
 
 Don't forget to add vital registry entries by applying winedefault.reg
-with programs/regapi/. See documentation/ directory for details.
+with programs/regedit/. See documentation/ directory for details.
 
 See http://www.winehq.com/support/ for further configuration hints.
 
diff --git a/documentation/README.fr b/documentation/README.fr
index 604e5a90424..b241e841bba 100644
--- a/documentation/README.fr
+++ b/documentation/README.fr
@@ -156,7 +156,7 @@ configuration qui doit 
 ci-dessus.
 
 N'oubliez pas d'ajouter des entrées de registre virtuelle en applicant
-winedefault.reg avec programs/regapi/. Voyez le répertoire documentation/ pour
+winedefault.reg avec programs/regedit/. Voyez le répertoire documentation/ pour
 les détails.
 
 Naviguez sur http://www.winehq.com/support/ pour plus d'astuce de configuration.
diff --git a/documentation/installing.sgml b/documentation/installing.sgml
index 237a461165f..1936f67f564 100644
--- a/documentation/installing.sgml
+++ b/documentation/installing.sgml
@@ -219,11 +219,11 @@ C:\                Root directory of primary disk drive
           <para>
             Use <filename>tools/wineinstall</filename> to compile Wine
             and install the default registry. Or if you prefer to do
-            it yourself, compile <filename>programs/regapi</filename>,
+            it yourself, compile <filename>programs/regedit</filename>,
             and run:
           </para>
 	  <screen>
-		<userinput>programs/regapi/regapi setValue &lt; winedefault.reg</userinput>
+		<userinput>programs/regedit/regedit &lt; winedefault.reg</userinput>
 	  </screen>
         </listitem>
         <listitem>
diff --git a/documentation/registry.sgml b/documentation/registry.sgml
index 07774088cac..fb16b425e93 100644
--- a/documentation/registry.sgml
+++ b/documentation/registry.sgml
@@ -240,8 +240,8 @@ ln -sf /usr/local/etc/wine.userreg wine.userreg
         installed for you if you use the
         <filename>tools/wineinstall</filename> script in the Wine source,
 	but if you want to install it manually, you can do so by using the
-        <command>regapi</command> tool to be found in the
-	<filename>programs/regapi/</filename>
+        <command>regedit</command> tool to be found in the
+	<filename>programs/regedit/</filename>
 	directory in Wine source.
       </para>
     </sect2>
diff --git a/tools/winecheck b/tools/winecheck
index bb8cd00cd40..ba754d185d2 100755
--- a/tools/winecheck
+++ b/tools/winecheck
@@ -619,7 +619,7 @@ sub Check_Registry {
   }
   else
   {
-    Do_PrintResult($is_critical, "entry \"SHAREDMEMLOCATION\" not found in system.reg registry file", "file winedefault.reg, the most basic wine registry environment, doesn't seem to have been applied using regapi");
+    Do_PrintResult($is_critical, "entry \"SHAREDMEMLOCATION\" not found in system.reg registry file", "file winedefault.reg, the most basic wine registry environment, doesn't seem to have been applied using regedit");
   }
   @entries = ();
 
diff --git a/winedefault.reg b/winedefault.reg
index 8b9b9a3dea2..d71fb5c67fd 100644
--- a/winedefault.reg
+++ b/winedefault.reg
@@ -1,5 +1,5 @@
 # These entries must apparently exist in any win95-compatible registry.
-# (feed this to `regapi setValue' to install)
+# (feed this to 'regedit' to install)
 
 # Shell Folders. The purpose of these are pretty self-evident.
 # Primarily used by installation programs and the Explorer.