diff --git a/contrib/oid2name/Makefile b/contrib/oid2name/Makefile
index 616e0da381c..4303164d6a4 100644
--- a/contrib/oid2name/Makefile
+++ b/contrib/oid2name/Makefile
@@ -2,7 +2,7 @@
 #
 
 subdir = contrib/oid2name
-top_builddir = /pgtop/
+top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS += -I$(libpq_srcdir)
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index ca5ca1d17d6..6d2105d9b32 100644
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -331,9 +331,9 @@ void sql_exec_dumptable(PGconn *conn, int systables)
 
   /* don't exclude the systables if this is set */
   if(systables == 1)
-    sprintf(todo, "select oid,relname from pg_class order by relname");
+    sprintf(todo, "select relfilenode,relname from pg_class order by relname");
   else
-    sprintf(todo, "select oid,relname from pg_class where relname not like 'pg_%%' order by relname");
+    sprintf(todo, "select relfilenode,relname from pg_class where relname not like 'pg_%%' order by relname");
 
   sql_exec(conn, todo, NULL);
 }
@@ -348,7 +348,7 @@ void sql_exec_searchtable(PGconn *conn, char *tablename)
   todo = (char *) malloc (1024);
 
   /* get the oid and tablename where the name matches tablename */
-  sprintf(todo, "select oid,relname from pg_class where relname = '%s'", tablename);
+  sprintf(todo, "select relfilenode,relname from pg_class where relname = '%s'", tablename);
 
   returnvalue = sql_exec(conn, todo, 1);
 
@@ -372,7 +372,7 @@ void sql_exec_searchoid(PGconn *conn, int oid)
 
   todo = (char *) malloc (1024);
 
-  sprintf(todo, "select oid,relname from pg_class where oid = %i", oid);
+  sprintf(todo, "select relfilenode,relname from pg_class where oid = %i", oid);
 
   returnvalue = sql_exec(conn, todo, 1);
 
diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml
index e8c9f9ee3ce..f7183b54785 100644
--- a/doc/src/sgml/gist.sgml
+++ b/doc/src/sgml/gist.sgml
@@ -15,10 +15,11 @@ The information about GIST is at
  <ULink url="http://GiST.CS.Berkeley.EDU:8000/gist/">http://GiST.CS.Berkeley.EDU:8000/gist/</ULink>
 
 with more on different indexing and sorting schemes at
-<ULink url="http://s2k-ftp.CS.Berkeley.EDU:8000/personal/jmh/">http://s2k-ftp.CS.Berkeley.EDU:8000/personal/jmh/</ULink>
+<ULink url="http://s2k-ftp.CS.Berkeley.EDU:8000/personal/jmh/">http://s2k-ftp.CS.Berkeley.EDU:8000/personal/jmh/</ULink>.
 
-And there is more interesting reading at the Berkely database site at 
-<ULink url="http://epoch.cs.berkeley.edu:8000/">http://epoch.cs.berkeley.edu:8000/</ULink>.
+And there is more interesting reading at
+<ULink url="http://epoch.cs.berkeley.edu:8000/">http://epoch.cs.berkeley.edu:8000/</ULink> and
+<ULink url="http://www.sai.msu.su/~megera/postgres/gist/">http://www.sai.msu.su/~megera/postgres/gist/</ULink>.
 </para>
 
 <Para>