diff -ur xdvik-ja-22.15-j1.03.ORIG/debian/Makefile xdvik-ja-22.15-j1.03/debian/Makefile
--- xdvik-ja-22.15-j1.03.ORIG/debian/Makefile	Tue Dec 21 01:03:22 1999
+++ xdvik-ja-22.15-j1.03/debian/Makefile	Tue Dec 21 01:23:04 1999
@@ -29,16 +29,13 @@
 		--enable-shared \
 		--with-dvifilter=dvi2ps \
 		--with-vfontmap=/etc/texmf/vfontmap \
+		--disable-buttons \
 		--enable-vikey \
 		--disable-smallpanel \
 		--enable-xdviprint=/usr/bin/xdviprint \
 		--enable-xdvietcdir=/etc/texmf 
 
 	cd texk/xdvik; make CFLAGS="-O2 -fomit-frame-pointer" VFLIB=$(VFLIB) \
-		  SDEFS="-DSMALL_PANEL -DSHRINK=\"12\"" LDFLAGS=-s ; \
-		  mv xdvi.bin xdvi.small.bin ; \
-		  rm -f xdvi.o toc.o events.o ; \
-		  make CFLAGS="-O2 -fomit-frame-pointer" VFLIB=$(VFLIB) \
 		  SDEFS="" LDFLAGS=-s 
 
 # This this installs below $(prefix)
diff -ur xdvik-ja-22.15-j1.03.ORIG/debian/xdvi-ja xdvik-ja-22.15-j1.03/debian/xdvi-ja
--- xdvik-ja-22.15-j1.03.ORIG/debian/xdvi-ja	Tue Dec 21 01:03:22 1999
+++ xdvik-ja-22.15-j1.03/debian/xdvi-ja	Tue Dec 21 01:35:03 1999
@@ -45,4 +45,4 @@
   XFILESEARCHPATH="$xdviapppath:${XFILESEARCHPATH-%D}"; export XFILESEARCHPATH
 fi
 
-exec xdvi-ja.bin $NAMEOPT ${1+"$@"}
+exec dvipoint.bin $NAMEOPT ${1+"$@"}
diff -ur xdvik-ja-22.15-j1.03.ORIG/texk/xdvik/xdvi-config.h xdvik-ja-22.15-j1.03/texk/xdvik/xdvi-config.h
--- xdvik-ja-22.15-j1.03.ORIG/texk/xdvik/xdvi-config.h	Tue Dec 21 01:03:22 1999
+++ xdvik-ja-22.15-j1.03/texk/xdvik/xdvi-config.h	Tue Dec 21 01:19:03 1999
@@ -75,7 +75,7 @@
 #define GREY 1
 #endif /* NOCOLOR */
 #ifndef NOTOC
-#define TOC
+/* #define TOC */
 #define MAX_PAGE 1024
 #endif /* NOTOC */
 #ifndef NOPAGENUM
diff -ur xdvik-ja-22.15-j1.03.ORIG/texk/xdvik/xdvi.c xdvik-ja-22.15-j1.03/texk/xdvik/xdvi.c
--- xdvik-ja-22.15-j1.03.ORIG/texk/xdvik/xdvi.c	Tue Dec 21 01:03:22 1999
+++ xdvik-ja-22.15-j1.03/texk/xdvik/xdvi.c	Tue Dec 21 02:09:39 1999
@@ -127,7 +127,7 @@
 #endif
 
 #if A4
-#define	DEFAULT_PAPER		"a4"
+#define	DEFAULT_PAPER		"a4r"
 #else
 #define	DEFAULT_PAPER		"us"
 #endif
@@ -1233,7 +1233,7 @@
 #ifdef Omega
         Fputs("Usage: oxdvi [+[<page>]]", stderr);
 #else
-	Fputs("Usage: xdvi [+[<page>]]", stderr);
+	Fputs("Usage: dvipoint [+[<page>]]", stderr);
 #endif
 	for (opt = options; opt < options + XtNumber(options); ++opt) {
 #ifdef	TOOLKIT
@@ -1776,7 +1776,8 @@
 	for (opt = options; opt < options + XtNumber(options); ++opt)
 	    if (opt->resource &&
 		    ((optstring = XGetDefault(DISP, prog, opt->resource)) ||
-		    (optstring = XGetDefault(DISP, "XDvi", opt->resource))))
+		     (optstring = XGetDefault(DISP, "Dvipoint", opt->resource)) ||
+		     (optstring = XGetDefault(DISP, "XDvi", opt->resource))))
 		{
 		    lastopt = opt + opt->classcount;
 		    for (candidate = opt; candidate < lastopt; ++candidate)
@@ -1997,8 +1998,8 @@
         title_name = xmalloc(baselen + sizeof("(Omega) OXdvi:  "));
         Strcpy(title_name, "(Omega) OXdvi:  ");
 #else
-        title_name = xmalloc(baselen + sizeof("Xdvi:  "));
-        Strcpy(title_name, "Xdvi:  ");
+        title_name = xmalloc(baselen + sizeof("Dvipoint:  "));
+        Strcpy(title_name, "Dvipoint:  ");
 #endif
         Strcat(title_name, icon_name);
 
@@ -2193,7 +2194,7 @@
 
 #ifdef	TOOLKIT
 
-	top_level = XtInitialize(prog, "XDvi", options, XtNumber(options),
+	top_level = XtInitialize(prog, "Dvipoint", options, XtNumber(options),
 	  &argc, argv);
 	while (--argc > 0) {
 	    if (*(*++argv) == '+')