diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f6401ede..6ec0e79f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1913,3 +1913,6 @@ Dominique Simon <d.simon@gmx.net>
 
 M. Kiesel <vdr@continuity.cjb.net>
  for reporting that the 'runvdr' script still used DVBDIR
+
+Prakash Punnoor <prakash@punnoor.de>
+ for suggesting to remove -fPIC from VDR's and libsi's Makefile
diff --git a/HISTORY b/HISTORY
index 54bfa482..f5493822 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4735,3 +4735,4 @@ Video Disk Recorder Revision History
   currently open (i.e. a write lock on the schedules data can't be achieved).
 - Fixed handling VPS timers in case the EPG event hasn't been 'seen' in a while.
 - Fixed calculating the cache size in cUnbufferedFile::Read() (thanks to Artur Skawina).
+- Removed -fPIC from VDR's and libsi's Makefile (suggested by Prakash Punnoor).
diff --git a/Make.config.template b/Make.config.template
index e307ba91..4a22f655 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -6,15 +6,15 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 1.8 2006/04/15 12:28:03 kls Exp $
+# $Id: Make.config.template 1.9 2006/05/26 10:41:46 kls Exp $
 
 ### The C compiler and options:
 
 CC       = gcc
-CFLAGS   = -O2
+CFLAGS   = -g -O2 -Wall
 
 CXX      = g++
-CXXFLAGS = -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
diff --git a/Makefile b/Makefile
index 7adebcc9..7b542eb5 100644
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,15 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.92 2006/05/19 12:00:32 kls Exp $
+# $Id: Makefile 1.93 2006/05/26 10:42:17 kls Exp $
 
 .DELETE_ON_ERROR:
 
 CC       ?= gcc
-CFLAGS   ?= -O2
+CFLAGS   ?= -g -O2 -Wall
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
 
 LSIDIR   = ./libsi
 MANDIR   = /usr/local/man
diff --git a/libsi/Makefile b/libsi/Makefile
index 9a6cc29a..cfc889b8 100644
--- a/libsi/Makefile
+++ b/libsi/Makefile
@@ -1,12 +1,12 @@
 #
 # Makefile for a libsi
 #
-# $Id: Makefile 1.5 2005/05/29 11:30:00 kls Exp $
+# $Id: Makefile 1.6 2006/05/26 10:40:19 kls Exp $
 
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual
+CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual
 AR = ar
 ARFLAGS = ru
 RANLIB = ranlib