diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 670000655c..1902f52b3e 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -124,7 +124,6 @@ fi
 
 Things-to-keep:
 
-.gdbinit
 29k-share
 COPYING
 ChangeLog
@@ -236,6 +235,7 @@ gdb.gdb
 gdba.el
 gdbcmd.h
 gdbcore.h
+gdbinit.in
 gdbserver
 gdbthread.h
 gdbtypes.c
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aa15a5a8fa..1d67e8d20b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 31 14:55:53 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* gdbinit.in: New file.
+	* .gdbinit: Remove.
+	* configure.in: Generate .gdbinit from gdbinit.in.
+	* configure: Rebuild.
+
 start-sanitize-tic80
 Sun Mar 30 12:28:24 1997  Fred Fish  <fnf@cygnus.com>
 
diff --git a/gdb/configure b/gdb/configure
index 4fbc05fc47..7b09d45690 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -3179,7 +3179,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile .gdbinit:gdbinit.in config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -3314,7 +3314,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile .gdbinit:gdbinit.in"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -3546,14 +3546,6 @@ sed -e '/^TM_FILE[ 	]*=/s,^TM_FILE[ 	]*=[ 	]*,&config/'"${gdb_target_cpu}"'/,
 /^NAT_FILE[ 	]*=/s,^NAT_FILE[ 	]*=[ 	]*,&config/'"${gdb_host_cpu}"'/,' <Makefile >Makefile.tmp
 mv -f Makefile.tmp Makefile
 
-case ${srcdir} in
-.)
-;;
-*)
-grep "source ${srcdir}/.gdbinit" .gdbinit >/dev/null 2>/dev/null || \
-echo "source ${srcdir}/.gdbinit" >> .gdbinit
-esac
-
 case x$CONFIG_HEADERS in
 xconfig.h:config.in)
 echo > stamp-h ;;
diff --git a/gdb/configure.in b/gdb/configure.in
index 84f7c61299..4742f24a38 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -460,7 +460,7 @@ fi
 AC_LINK_FILES($files, $links)
 
 AC_CONFIG_SUBDIRS($configdirs)
-AC_OUTPUT(Makefile, 
+AC_OUTPUT(Makefile .gdbinit:gdbinit.in,
 [
 dnl Autoconf doesn't provide a mechanism for modifying definitions 
 dnl provided by makefile fragments.
@@ -478,14 +478,6 @@ sed -e '/^TM_FILE[ 	]*=/s,^TM_FILE[ 	]*=[ 	]*,&config/'"${gdb_target_cpu}"'/,
 mv -f Makefile.tmp Makefile
 changequote([,])dnl
 
-case ${srcdir} in
-.)
-;;
-*)
-grep "source ${srcdir}/.gdbinit" .gdbinit >/dev/null 2>/dev/null || \
-echo "source ${srcdir}/.gdbinit" >> .gdbinit
-esac
-
 case x$CONFIG_HEADERS in
 xconfig.h:config.in)
 echo > stamp-h ;;
diff --git a/gdb/.gdbinit b/gdb/gdbinit.in
similarity index 62%
rename from gdb/.gdbinit
rename to gdb/gdbinit.in
index f60802e500..af97d2cae3 100644
--- a/gdb/.gdbinit
+++ b/gdb/gdbinit.in
@@ -10,7 +10,9 @@ commands
 	return
 end
 
-dir ../mmalloc
-dir ../libiberty
-dir ../bfd
+dir @srcdir@
+dir .
+dir @srcdir@/../mmalloc
+dir @srcdir@/../libiberty
+dir @srcdir@/../bfd
 set prompt (top-gdb)