diff --git a/CHANGES b/CHANGES
index 1a50f1be..b132bb7b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -283,4 +283,5 @@ o inifile:
 o YMisc:
   - added cropstr() and unquote()
 o make:
-  - replaced ytools.mk by proj.mk to be consistent with other projects
+  - replaced ytools.mk -> proj.mk and MODDIR definition by TOPDIR definition 
+    to be consistent with other projects
diff --git a/Makefile b/Makefile
index 61da1a31..f2da2151 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,7 @@
 # contact@jannet.de
 # $Id$
 
-TOPDIR=.
-MODDIR=.
+TOPDIR = .
 
 SUBDIRS = inst/pre \
 		make \
@@ -26,9 +25,9 @@ SUBDIRS = inst/pre \
 		lib include bin \
 		inst/post
 
-ifneq ($(wildcard $(MODDIR)/make/proj.mk),)
+ifneq ($(wildcard $(TOPDIR)/make/proj.mk),)
 
-include $(MODDIR)/make/proj.mk
+include $(TOPDIR)/make/proj.mk
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/subdirs.mk
 include $(MODDIR)/make/rules.mk
diff --git a/bin/Makefile b/bin/Makefile
index e73e7d52..cff47256 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -29,9 +29,9 @@
 #                                                                      #
 ########################################################################
 
-MODDIR  = ..
+TOPDIR = ..
 
-include $(MODDIR)/make/proj.mk
+include $(TOPDIR)/make/proj.mk
 include $(MODDIR)/make/scripts.mk
 
 all:
diff --git a/make/Makefile b/make/Makefile
index 15a1d44d..8b7e7c7a 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -3,7 +3,7 @@
 # contact@jannet.de
 # $Id$
 
-MODDIR = ..
+TOPDIR = ..
 
-include $(MODDIR)/make/proj.mk
+include $(TOPDIR)/make/proj.mk
 include $(MODDIR)/make/make.mk
diff --git a/scripts/Makefile b/scripts/Makefile
index 846d1024..24d9cf68 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -29,9 +29,9 @@
 #                                                                      #
 ########################################################################
 
-MODDIR  = ../..
+TOPDIR = ../..
 
-include $(MODDIR)/make/proj.mk
+include $(TOPDIR)/make/proj.mk
 
 EXE_SH += cvsbuild
 
diff --git a/tmpl/tex/Makefile b/tmpl/tex/Makefile
index 983cc38e..867368ff 100644
--- a/tmpl/tex/Makefile
+++ b/tmpl/tex/Makefile
@@ -1,5 +1,5 @@
-MODDIR=..
+TOPDIR = ..
 SUBDIRS = $(FIND_SUBDIRS)
 
-include $(MODDIR)/make/proj.mk
+include $(TOPDIR)/make/proj.mk
 include $(MODDIR)/make/dirs.mk
diff --git a/tmpl/tex/de_contract/Makefile b/tmpl/tex/de_contract/Makefile
index 6c7691c3..c4978a6c 100644
--- a/tmpl/tex/de_contract/Makefile
+++ b/tmpl/tex/de_contract/Makefile
@@ -2,7 +2,7 @@
 # contact@jannet.de
 # $Id$
 
-MODDIR = ../..
+TOPDIR = ../..
 
-include $(MODDIR)/make/proj.mk
+include $(TOPDIR)/make/proj.mk
 include $(MODDIR)/make/text.mk
diff --git a/tmpl/tex/de_technical/Makefile b/tmpl/tex/de_technical/Makefile
index 6c7691c3..c4978a6c 100644
--- a/tmpl/tex/de_technical/Makefile
+++ b/tmpl/tex/de_technical/Makefile
@@ -2,7 +2,7 @@
 # contact@jannet.de
 # $Id$
 
-MODDIR = ../..
+TOPDIR = ../..
 
-include $(MODDIR)/make/proj.mk
+include $(TOPDIR)/make/proj.mk
 include $(MODDIR)/make/text.mk
diff --git a/tmpl/tex/en_technical/Makefile b/tmpl/tex/en_technical/Makefile
index 6c7691c3..c4978a6c 100644
--- a/tmpl/tex/en_technical/Makefile
+++ b/tmpl/tex/en_technical/Makefile
@@ -2,7 +2,7 @@
 # contact@jannet.de
 # $Id$
 
-MODDIR = ../..
+TOPDIR = ../..
 
-include $(MODDIR)/make/proj.mk
+include $(TOPDIR)/make/proj.mk
 include $(MODDIR)/make/text.mk