diff --git a/ChangeLog b/ChangeLog
index d1f365c79f4..e3fa175352a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-27  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.tpl (PICFLAG, PICFLAG_FOR_TARGET): Remove.
+	* Makefile.in: Regenerate.
+
 2008-03-26  Jakub Staszak  <kuba@et.pl>
 
 	* MAINTAINERS (Write After Approval): Add myself.
diff --git a/Makefile.in b/Makefile.in
index 518ca4cbd2b..ff3e9072136 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -319,7 +319,6 @@ LDFLAGS = @LDFLAGS@
 LIBCFLAGS = $(CFLAGS)
 CXXFLAGS = @CXXFLAGS@
 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
-PICFLAG = 
 
 # Only build the C compiler for stage1, because that is the only one that
 # we can guarantee will build with the native compiler, and also it is the
@@ -386,7 +385,6 @@ DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 LDFLAGS_FOR_TARGET = 
-PICFLAG_FOR_TARGET = 
 
 # ------------------------------------
 # Miscellaneous targets and flag lists
diff --git a/Makefile.tpl b/Makefile.tpl
index 6bc461bfdda..95441f5bc43 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -322,7 +322,6 @@ LDFLAGS = @LDFLAGS@
 LIBCFLAGS = $(CFLAGS)
 CXXFLAGS = @CXXFLAGS@
 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
-PICFLAG = 
 
 # Only build the C compiler for stage1, because that is the only one that
 # we can guarantee will build with the native compiler, and also it is the
@@ -389,7 +388,6 @@ DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 LDFLAGS_FOR_TARGET = 
-PICFLAG_FOR_TARGET = 
 
 # ------------------------------------
 # Miscellaneous targets and flag lists
diff --git a/config/ChangeLog b/config/ChangeLog
index deefcd02cd3..f6dc2a4e242 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,15 @@
+2008-03-27  Paolo Bonzini  <bonzini@gnu.org>
+
+	* mh-armpic: Remove.
+	* mh-i370pic: Remove.
+	* mh-m68kpic: Remove.
+	* mh-ppcpic: Remove.
+	* mh-sparcpic: Remove.
+	* mh-ia64pic: Remove.
+	* mh-papic: Remove.
+	* mh-s390pic: Remove.
+	* mh-x86pic: Remove.
+
 2008-03-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* proginstall.m4: New file, with fixed AC_PROG_INSTALL.
diff --git a/config/mh-armpic b/config/mh-armpic
deleted file mode 100644
index 35cf2c8ee4e..00000000000
--- a/config/mh-armpic
+++ /dev/null
@@ -1 +0,0 @@
-PICFLAG=-fPIC
diff --git a/config/mh-elfalphapic b/config/mh-elfalphapic
deleted file mode 100644
index 35cf2c8ee4e..00000000000
--- a/config/mh-elfalphapic
+++ /dev/null
@@ -1 +0,0 @@
-PICFLAG=-fPIC
diff --git a/config/mh-i370pic b/config/mh-i370pic
deleted file mode 100644
index 35cf2c8ee4e..00000000000
--- a/config/mh-i370pic
+++ /dev/null
@@ -1 +0,0 @@
-PICFLAG=-fPIC
diff --git a/config/mh-ia64pic b/config/mh-ia64pic
deleted file mode 100644
index 92e48d90fbd..00000000000
--- a/config/mh-ia64pic
+++ /dev/null
@@ -1 +0,0 @@
-PICFLAG=-fpic
diff --git a/config/mh-m68kpic b/config/mh-m68kpic
deleted file mode 100644
index 92e48d90fbd..00000000000
--- a/config/mh-m68kpic
+++ /dev/null
@@ -1 +0,0 @@
-PICFLAG=-fpic
diff --git a/config/mh-papic b/config/mh-papic
deleted file mode 100644
index 35cf2c8ee4e..00000000000
--- a/config/mh-papic
+++ /dev/null
@@ -1 +0,0 @@
-PICFLAG=-fPIC
diff --git a/config/mh-ppcpic b/config/mh-ppcpic
deleted file mode 100644
index 35cf2c8ee4e..00000000000
--- a/config/mh-ppcpic
+++ /dev/null
@@ -1 +0,0 @@
-PICFLAG=-fPIC
diff --git a/config/mh-s390pic b/config/mh-s390pic
deleted file mode 100644
index 92e48d90fbd..00000000000
--- a/config/mh-s390pic
+++ /dev/null
@@ -1 +0,0 @@
-PICFLAG=-fpic
diff --git a/config/mh-sparcpic b/config/mh-sparcpic
deleted file mode 100644
index e218bb48aa4..00000000000
--- a/config/mh-sparcpic
+++ /dev/null
@@ -1 +0,0 @@
-PICFLAG=`case '${LIBCFLAGS} ${LIBCXXFLAGS}' in *-fpic* ) echo -fpic ;; * ) echo -fPIC ;; esac`
diff --git a/config/mh-x86pic b/config/mh-x86pic
deleted file mode 100644
index 92e48d90fbd..00000000000
--- a/config/mh-x86pic
+++ /dev/null
@@ -1 +0,0 @@
-PICFLAG=-fpic