diff --git a/Makefile b/Makefile
index ec54e2194e..8610d45803 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
 #
-#
 # Top Level EPICS Makefile
 #        by Matthew Needes and Mike Bordua
 #
@@ -11,58 +10,11 @@
 #    However, the release dependencies DOES require a complete
 #         install because the release.% syntax is illegal.
 #
-# $Log$
-# Revision 1.26  1996/01/25 21:37:09  mrk
-# uninstall base/man
-#
-# Revision 1.25  1996/01/25 21:29:42  mrk
-# base/rec=>base/db base/include now installed
-#
-# Revision 1.24  1995/08/17  20:14:59  jba
-# Added base/tools scripts functionality to base/Makefile, removed scripts
-# Moved base/tools/MakeRelease to base dir.
-#
-# Revision 1.23  1995/02/13  15:00:09  jba
-# Changed include file from CONFIG_SITE to CONFIG
-#
-# Revision 1.22  1994/11/14  23:12:17  tang
-# Replace ARCH_TYPE with .
-#
-# Revision 1.1.1.1  1994/11/09  01:08:53  epics
-# Import of R3.12.0Beta
-#
-# Revision 1.18  1994/10/13  19:44:34  mda
-# Introduce temporary symbol (ARCH_TYPE=$$ARCH) and use in later targets/rules
-# to avoid problem with $* symbol resolution in some versions of gnumake.
-#
-# Revision 1.17  1994/10/05  18:45:57  jba
-# Modified syntax of makefile usage
-#
-# Revision 1.16  1994/09/09  17:32:27  jba
-# Cleanup of files
-#
-# Revision 1.15  1994/09/08  17:25:39  mcn
-# Changed clean to tools/Clean.  Added "uninstall" dependency.
-#
-# Revision 1.14  1994/09/07  20:42:19  jba
-# Minor changes
-#
-# Revision 1.13  1994/09/07  19:15:17  jba
-# Modified to eork with extensions and do depends
-#
-# Revision 1.12  1994/08/21  00:55:51  mcn
-# New stuff.
-#
-# Revision 1.11  1994/08/19  15:38:01  mcn
-# Dependencies are now generated with a "make release".
-#
-# Revision 1.10  1994/08/12  18:51:29  mcn
-# Added Log and/or Id.
-#
+# $Id$
 #
 
-EPICS=..
-include $(EPICS)/config/CONFIG
+TOP=.
+include $(TOP)/src/config/CONFIG_BASE
 
 all: install
 
@@ -93,11 +45,11 @@ uninstall:
 
 release: 
 	@echo TOP: Creating Release...
-	@./MakeRelease ${EPICS}
+	@./MakeRelease ${TOP}
 
 built_release: install
 	@echo TOP: Creating Fully Built Release...
-	@./MakeRelease ${EPICS} -b
+	@./MakeRelease ${TOP} -b
 
 #  Notes for single architecture build rules:
 #    CheckArch only has to be run for dirs.% .  That
@@ -138,7 +90,7 @@ release.%:
 
 uninstall.%:
 	@echo "TOP: Uninstalling $* "
-	@rm -rf ./bin/$* ./lib/$* db include man
+	@rm -rf ./bin/$* ./lib/$* dbd include man config
 	@rm -rf  rec.bak rec
 
 clean.%: