diff --git a/doc/ChangeLog b/doc/ChangeLog
index f16938d846..82942f3709 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -5,6 +5,8 @@
 	* configure.ac: Reflect changes above.
 	* project.am: Add COMMON_FILES.
 	Add rules to build common/rtems.texi.
+	* common/setup.texi: Remove RTEMS* VARs, moved to
+	common/rtems.texi.in.
 
 2003-08-29	Joel Sherrill <joel@OARcorp.com>
 
diff --git a/doc/common/setup.texi b/doc/common/setup.texi
index f38f27e990..b41cd63cb9 100644
--- a/doc/common/setup.texi
+++ b/doc/common/setup.texi
@@ -61,13 +61,3 @@
 \global\parskip 6pt plus 1pt
 @end ifclear
 @end tex
-
-@set RTEMSHTTPSITE		www.rtems.com
-@set RTEMSUSERS			rtems-users@@rtems.com
-@set RTEMSUSERSSUBSCRIBE	rtems-users-subscribe@@rtems.com
-@set RTEMSSNAPSHOTS 		rtems-snapshots@@rtems.com
-@set RTEMSSNAPSHOTSSUBSCRIBE 	rtems-snapshots-subscribe@@rtems.com
-@set RTEMSBUGS			rtems-bugs@@rtems.com
-@set RTEMSFTPURL		ftp://www.rtems.com
-@set RTEMSHTTPURL		http://www.rtems.com
-@set RTEMSGNATS			@value{RTEMSHTTPURL}/cgi-bin/gnatsweb.pl