diff --git a/Makefile b/Makefile
index caad6e6..18e1208 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
 CC = gcc
-CXX = gcc
-#CC = gcc-3.0
-#CXX = gcc-3.0
+CXX = g++
 NASM = nasm
 
 #CFLAGS = -g -Wall -pipe
@@ -14,9 +12,6 @@ CXXFLAGS = $(CFLAGS)
 
 LDLIBS = $(shell sdl-config --libs) -lGL -lopenal
 
-# required for gcc-3
-#LDLIBS += -lstdc++
-
 AFLAGS = -g -w+macro-params -w+orphan-labels -w+number-overflow
 
 ROOT = main.c files.c winapi.c stubs.c version.c mathline.c math.asm opengl.c openal.c cdplayer.c menus.c net.c frustum.c kshape.c map.c maths.c md5.c mem3dc.c mem3dcpp.cpp module.c morph.c object.c shpanim.c sphere.c tables.c vdb.c
@@ -59,7 +54,7 @@ OBJ = $(ROOTOBJ) $(AVPOBJ) $(SHAPESOBJ) $(SUPPORTOBJ) $(AVPWIN95OBJ) $(FRONTENDO
 all: AvP
 
 AvP: $(OBJ) # depend $(OBJ)
-	$(CC) -o AvP $(OBJ) $(LDLIBS)
+	$(CXX) -o AvP $(OBJ) $(LDLIBS)
 
 compile: $(OBJ)