diff --git a/ChangeLog b/ChangeLog
index ea7edba36..92b72b1d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* src/otvalid/module.mk: s/otvalid_module_class/otv_module_class/.
 	* src/gxvalid/module.mk: s/gxvalid_module_class/gxv_module_class/.
 
+	* builds/unix/unixddef.mk: Actually do define PLATFORM (fixing
+	change from 2006-01-31).
+	(TOP_DIR, OBJ_DIR): Update.
+
 2006-01-31  Werner Lemberg  <wl@gnu.org>
 
 	Implement new, simplified module selection.  With GNU make it is now
diff --git a/builds/unix/unixddef.mk b/builds/unix/unixddef.mk
index e26d61eed..991642e4f 100644
--- a/builds/unix/unixddef.mk
+++ b/builds/unix/unixddef.mk
@@ -14,10 +14,10 @@
 # fully.
 
 
-ifndef TOP_DIR
-  TOP_DIR := .
-endif
 TOP_DIR := $(shell cd $(TOP_DIR); pwd)
+OBJ_DIR := $(shell cd $(OBJ_DIR); pwd)
+
+PLATFORM := unix
 
 DELETE := rm -f
 SEP    := /
@@ -25,12 +25,6 @@ SEP    := /
 # we use a special devel ftoption.h
 DEVEL_DIR := $(TOP_DIR)/devel
 
-# The directory where all object files are placed.
-#
-ifndef OBJ_DIR
-  OBJ_DIR := $(shell cd $(TOP_DIR)/objs; pwd)
-endif
-
 
 # library file name
 #