diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 95e86899..fad747b9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -458,6 +458,7 @@ Robert Schiele <rschiele@uni-mannheim.de>
  for reporting some faulty default parameter initializations
  for suggesting to only set the Makefile variables CXX and CXXFLAGS if they are not
  yet defined
+ for fixing a problem with user defined CFLAGS in libdtv/libvdr/Makefile
 
 Gerhard Steiner <steiner@mail.austria.com>
  for suggesting that the SVDRP command PUTE shall trigger an immediate write of
@@ -503,6 +504,7 @@ Georg Hitsch <georg@hitsch.at>
 
 Clemens Kirchgatterer <clemens@thf.ath.cx>
  for suggesting to change source directory name for plugins from 'SRC' to 'src'
+ for reporting a problem with user defined CFLAGS in libdtv/libvdr/Makefile
 
 Emil Naepflein <Emil.Naepflein@philosys.de>
  for suggesting to take an active SVDRP connection into account when doing shutdown or
diff --git a/HISTORY b/HISTORY
index 7fae0eae..a7f09f4e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1938,3 +1938,5 @@ Video Disk Recorder Revision History
 - Fixed handling the LOG_LOCALn parameters in the -l option (thanks to Dimitrios
   Dimitrakos).
 - Changed EIT processing to always read a full section.
+- Fixed handling user defined CFLAGS in libdtv/libvdr/Makefile (thanks to Clemens
+  Kirchgatterer and Robert Schiele).
diff --git a/libdtv/liblx/Makefile b/libdtv/liblx/Makefile
index 2531708a..d06ee091 100644
--- a/libdtv/liblx/Makefile
+++ b/libdtv/liblx/Makefile
@@ -27,8 +27,8 @@
 #
 #
 #
-CC = gcc
-CFLAGS = -O2 -g -pedantic -Wmissing-prototypes -Wstrict-prototypes \
+CC ?= gcc
+CFLAGS ?= -O2 -g -pedantic -Wmissing-prototypes -Wstrict-prototypes \
          -Wimplicit -D__USE_FIXED_PROTOTYPES__ # -DDEBUG
 
 
diff --git a/libdtv/libvdr/Makefile b/libdtv/libvdr/Makefile
index 0f2ad721..6eebedd4 100644
--- a/libdtv/libvdr/Makefile
+++ b/libdtv/libvdr/Makefile
@@ -29,8 +29,9 @@
 #
 CC ?= gcc
 CFLAGS ?= -O2 -g -Wmissing-prototypes -Wstrict-prototypes \
-         -Wimplicit -D__USE_FIXED_PROTOTYPES__ -I../include # -DDEBUG
+         -Wimplicit -D__USE_FIXED_PROTOTYPES__ # -DDEBUG
 
+CFLAGS += -I../include
 
 AR = ar
 ARFLAGS = r