diff --git a/ChangeLog b/ChangeLog
index 47ab66e36d..1c40a365f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/rtems-top.m4: Set PROJECT_ROOT unconditionally.
+	* automake/local.am: Remove $(ARCH), clean-local.
+	* automake/compile.am: Add $(ARCH), clean-local.
+	Set CXXFLAGS = @RTEMS_CFLAGS@ $(XCXXFLAGS).
+
 2003-02-15	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Remove references to obsoleted files
diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index 82da20edd5..5888d58253 100644
--- a/aclocal/rtems-top.m4
+++ b/aclocal/rtems-top.m4
@@ -35,13 +35,7 @@ PROJECT_TOPdir=${dots}${RTEMS_TOPdir}/'$(top_builddir)'
 fi
 AC_SUBST(PROJECT_TOPdir)
 
-if test "$with_target_subdir" = "." ; then
-# Native
 PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
-else
-# Cross
-PROJECT_ROOT="${RTEMS_TOPdir}/\$(top_builddir)"
-fi
 AC_SUBST(PROJECT_ROOT)
 
 AC_MSG_CHECKING([for RTEMS Version])
diff --git a/automake/compile.am b/automake/compile.am
index abe0a8acfa..f7aa280ec3 100644
--- a/automake/compile.am
+++ b/automake/compile.am
@@ -55,7 +55,10 @@ DEFS = @DEFS@
 
 CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) $(XCPPFLAGS)
 CFLAGS   = @RTEMS_CFLAGS@ $(XCFLAGS)
-CXXFLAGS = @RTEMS_CXXFLAGS@ $(XCXXFLAGS)
+## FIXME: This should be correct, but is not supported, yet
+# CXXFLAGS = @RTEMS_CXXFLAGS@ $(XCXXFLAGS)
+## Fall back to using RTEMS_CFLAGS for C++
+CXXFLAGS = @RTEMS_CFLAGS@ $(XCXXFLAGS)
 ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
 
 LINK_LIBS = $(LD_LIBS)
@@ -219,3 +222,10 @@ AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
 AM_CFLAGS =
 AM_CXXFLAGS =
 AM_CCASFLAGS = $(CPU_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS)
+
+${ARCH}:
+	mkdir ${ARCH}
+
+clean-local:
+	$(RM) -r o-optimize o-debug o-profile $(CLEANDIRS)
+	$(RM) Depends-o-optimize.tmp Depends-o-debug.tmp Depends-o-profile.tmp
diff --git a/automake/local.am b/automake/local.am
index 51572dccc5..013d48f70a 100644
--- a/automake/local.am
+++ b/automake/local.am
@@ -24,12 +24,5 @@ depend-am:
 depend: depend-am
 .PHONY: depend depend-am
 
-${ARCH}:
-	mkdir ${ARCH}
-
-clean-local:
-	$(RM) -r o-optimize o-debug o-profile $(CLEANDIRS)
-	$(RM) Depends-o-optimize.tmp Depends-o-debug.tmp Depends-o-profile.tmp
-
 PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools