diff --git a/configure.in b/configure.in
index 5d6d5e9..d9c023f 100644
--- a/configure.in
+++ b/configure.in
@@ -208,6 +208,7 @@ AC_CHECK_FUNCS([memset strrchr])
 dnl Add Makefile conditionals
 AM_CONDITIONAL(BUILD_ZLIB, test x$enable_internal_zlib = xyes)
 AM_CONDITIONAL(BUILD_TEST_PHYSFS, test x$enable_testprog = xyes)
+AM_CONDITIONAL(BUILD_BEOS_CPP, test x$this_is_beos = xyes)
 
 AC_OUTPUT([
 Makefile
diff --git a/platform/Makefile.am b/platform/Makefile.am
index 116c2d6..0ea4a94 100644
--- a/platform/Makefile.am
+++ b/platform/Makefile.am
@@ -2,14 +2,20 @@ noinst_LTLIBRARIES = libplatform.la
 
 INCLUDES = -I$(top_srcdir)
 
+if BUILD_BEOS_CPP
+  X = beos.cpp
+else
+  Y = beos.cpp
+endif
+
 libplatform_la_SOURCES =	\
 	unix.c                  \
 	posix.c                 \
-	beos.cpp
+	$(X)
 
 EXTRA_DIST =      \
 	skeleton.c    \
 	macclassic.c  \
-	win32.c
-
+	win32.c       \
+	$(Y)