diff --git a/cpukit/sapi/ChangeLog b/cpukit/sapi/ChangeLog
index de76eb4b9c..a1cb728e84 100644
--- a/cpukit/sapi/ChangeLog
+++ b/cpukit/sapi/ChangeLog
@@ -1,7 +1,14 @@
-2003-02-28	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+2003-03-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
-	* include/rtems/sptables.h.in: Remove RTEMS_VERSION (Moved to
-	cpuopts.h).
+	* include/rtems/sptables.h.in: Remove.
+	* include/rtems/sptables.h: New.
+	* include/.cvsignore: Remove.
+	* include/rtems/.cvsignore: Remove.
+	* inline/.cvsignore: Remove.
+	* inline/rtems/.cvsignore: Remove.
+	* macros/.cvsignore: Remove.
+	* macros/rtems/.cvsignore: Remove.
+	* src/.cvsignore: Remove.
 
 2003-02-03	Joel Sherrill <joel@OARcorp.com>
 
diff --git a/cpukit/sapi/include/.cvsignore b/cpukit/sapi/include/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/cpukit/sapi/include/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/cpukit/sapi/include/rtems/.cvsignore b/cpukit/sapi/include/rtems/.cvsignore
deleted file mode 100644
index 4f09d19b6d..0000000000
--- a/cpukit/sapi/include/rtems/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-sptables.h
diff --git a/cpukit/sapi/include/rtems/sptables.h.in b/cpukit/sapi/include/rtems/sptables.h
similarity index 92%
rename from cpukit/sapi/include/rtems/sptables.h.in
rename to cpukit/sapi/include/rtems/sptables.h
index 8e8e0a4a02..ddd19afbb0 100644
--- a/cpukit/sapi/include/rtems/sptables.h.in
+++ b/cpukit/sapi/include/rtems/sptables.h
@@ -63,13 +63,7 @@ extern const rtems_multiprocessing_table
        _Initialization_Default_multiprocessing_table;
 #endif
 
-#if defined(SAPI_INIT) 
-const char _RTEMS_version[] =
-  "RTEMS RELEASE " RTEMS_VERSION
-     "(" CPU_NAME "/" CPU_MODEL_NAME "/@RTEMS_BSP@)";
-#else
 extern const char _RTEMS_version[];
-#endif
 
 #ifdef __cplusplus
 }
diff --git a/cpukit/sapi/inline/.cvsignore b/cpukit/sapi/inline/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/cpukit/sapi/inline/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/cpukit/sapi/inline/rtems/.cvsignore b/cpukit/sapi/inline/rtems/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/cpukit/sapi/inline/rtems/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/cpukit/sapi/macros/.cvsignore b/cpukit/sapi/macros/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/cpukit/sapi/macros/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/cpukit/sapi/macros/rtems/.cvsignore b/cpukit/sapi/macros/rtems/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/cpukit/sapi/macros/rtems/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/cpukit/sapi/src/.cvsignore b/cpukit/sapi/src/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/cpukit/sapi/src/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in