diff --git a/HISTORY b/HISTORY
index 7a251bb4..7ca8259a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1389,3 +1389,4 @@ Video Disk Recorder Revision History
 - Added some missing teletext PIDs (thanks to Joerg Riechardt).
 - Fixed PID handling for cReceiver.
 - Added a missing #include to ringbuffer.c (thanks to Martin Hammerschmid).
+- Now using CC, CFLAGS, CXX and CXXFLAGS in Makefile.
diff --git a/Makefile b/Makefile
index 7e922184..59908382 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,16 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.42 2002/06/22 10:21:56 kls Exp $
+# $Id: Makefile 1.43 2002/07/28 13:24:58 kls Exp $
 
 .DELETE_ON_ERROR:
 
+CC       = gcc
+CFLAGS   = -O2
+
+CXX      = g++
+CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
+
 DVBDIR   = ../DVB
 DTVDIR   = ./libdtv
 MANDIR   = /usr/local/man
@@ -58,11 +64,11 @@ font: genfontfile fontfix.c fontosd.c
 # Implicit rules:
 
 %.o: %.c
-	g++ -g -O2 -Wall -Woverloaded-virtual -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
 # Dependencies:
 
-MAKEDEP = g++ -MM -MG
+MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
@@ -72,7 +78,7 @@ $(DEPFILE): Makefile
 # The main program:
 
 vdr: $(OBJS) $(DTVLIB)
-	g++ -g -O2 -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(DTVLIB) -o vdr
+	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) -ljpeg -lpthread -ldl $(LIBDIRS) $(DTVLIB) -o vdr
 
 # The font files:
 
@@ -84,7 +90,7 @@ fontosd.c:
 # The font file generator:
 
 genfontfile: genfontfile.c
-	gcc -o $@ -O2 -L/usr/X11R6/lib $< -lX11
+	$(CC) $(CFLAGS) -o $@ -L/usr/X11R6/lib $< -lX11
 
 # The libdtv library: