diff --git a/ChangeLog b/ChangeLog
index e34f779d84..ca205b9147 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/check-cxx.m4: Remove LIBSUFFIX_VA.
+	* automake/compile.am: Remove LIBSUFFIX_VA.
+
 2003-04-23	Joel Sherrill <joel@OARcorp.com>
 
 	* VERSION: Updated to rtems-4.6.0pre3.
diff --git a/aclocal/check-cxx.m4 b/aclocal/check-cxx.m4
index aa51596de5..a780c3a8de 100644
--- a/aclocal/check-cxx.m4
+++ b/aclocal/check-cxx.m4
@@ -20,7 +20,7 @@ HAS_CPLUSPLUS="$rtems_cv_HAS_CPLUSPLUS";
 AC_SUBST(HAS_CPLUSPLUS)dnl
 
 if test "$HAS_CPLUSPLUS" = "yes"; then
-CPLUS_LD_LIBS='$(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)'
+CPLUS_LD_LIBS='$(PROJECT_RELEASE)/lib/librtems++$(LIB_VARIANT).a'
 fi
 AC_SUBST(CPLUS_LD_LIBS)
 ])
diff --git a/automake/compile.am b/automake/compile.am
index 81181cead7..959b431472 100644
--- a/automake/compile.am
+++ b/automake/compile.am
@@ -183,7 +183,6 @@ LIBSUFFIX_PROFILE_V = _p
 LIBSUFFIX__V = $(LIBSUFFIX_OPTIMIZE_V)
 
 LIB_VARIANT = $(LIBSUFFIX_$(VARIANT_V)_V)
-LIBSUFFIX_VA = $(LIB_VARIANT).a
 
 ## These are supposed to be set in make/custom/<bsp>.cfg
 CPU_CFLAGS = @CPU_CFLAGS@