diff --git a/zsnes/src/Makefile.in b/zsnes/src/Makefile.in
index 6527a119..bd93da50 100644
--- a/zsnes/src/Makefile.in
+++ b/zsnes/src/Makefile.in
@@ -73,7 +73,7 @@ OBJS=${CHIPSOBJ} ${CPUOBJ} ${WINOBJ} ${WINDOSOBJ} ${GUIOBJ} ${VIDEOBJ} ${MAINOBJ
 .SUFFIXES: .cpp .c .asm 
 
 %.o: %.cpp
-	g++ @CFLAGS@ -o $@ -c $<
+	@CXX@ @CFLAGS@ -o $@ -c $<
 
 %.o: %.c
 	@CC@ @CFLAGS@ -o $@ -c $<
diff --git a/zsnes/src/configure.in b/zsnes/src/configure.in
index d54eb541..d291d717 100644
--- a/zsnes/src/configure.in
+++ b/zsnes/src/configure.in
@@ -21,6 +21,7 @@ dnl -- Same thing here.
 
 AC_CANONICAL_SYSTEM
 AC_PROG_CC
+AC_PROG_CXX
 AC_CHECK_TOOL(NASMPATH,nasm,"no",$nasm_prefix:$PATH)
 if test x$NASMPATH = xno; then
 AC_MSG_ERROR(You need NASM installed to compile ZSNES)