diff --git a/autogen.sh b/autogen.sh
index 46f98cad2..e6f149ebb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,3 +1,10 @@
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+(
+cd $srcdir
 cat macros/gnome.m4 mc-aclocal.m4 > aclocal.m4
 autoconf
-./configure $*
+)
+
+$srcdir/configure $*
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 87d7f97a0..71a20c01d 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -15,9 +15,9 @@ LINUXDOCDIR =	/usr/local/linuxdoc-sgml
 all:
 
 install:
-	-$(SEDCMD2) < $(srcdir)/mc.1 > $(DESTDIR)$(mandir)/$(manprefix)mc.$(manext)
-	-$(SEDCMD2) < $(srcdir)/mcedit.1 > $(DESTDIR)$(mandir)/$(manprefix)mcedit.$(manext)
-	-$(SEDCMD2) < $(srcdir)/mcserv.8 > $(DESTDIR)$(man8dir)/$(manprefix)mcserv.$(man8ext)
+	-$(SEDCMD2) < mc.1 > $(DESTDIR)$(mandir)/$(manprefix)mc.$(manext)
+	-$(SEDCMD2) < mcedit.1 > $(DESTDIR)$(mandir)/$(manprefix)mcedit.$(manext)
+	-$(SEDCMD2) < mcserv.8 > $(DESTDIR)$(man8dir)/$(manprefix)mcserv.$(man8ext)
 
 uninstall:
 	-cd $(mandir); $(RMF) $(manprefix)mc.$(manext)
diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index e198b828d..45d25d102 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 23 01:40:35 1998  Norbert Warmuth  <k3190@fh-sw.de>
+
+	* gtools.c (translate_gdk_keysym_to_curses): renamed KEY_BACKTAB
+	to KEY_BTAB (the name ncurses uses)
+
+	* Makefile.in: Install the icon-files and the layout-file from $srcdir.
+
 1998-03-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	* gdesktop.c (icon_properties): 
diff --git a/gnome/Makefile.in b/gnome/Makefile.in
index ffa909f99..7e93a74b9 100644
--- a/gnome/Makefile.in
+++ b/gnome/Makefile.in
@@ -44,11 +44,11 @@ GNOMEHDRS = 		\
 	gpageprop.h	\
 	gmc-chargrid.h
 
-ICONS = 			\
-	directory-ok.xpm	\
-	directory.xpm		\
-	multi.xpm		\
-	multi-ok.xpm
+ICONS = 				\
+	$(srcdir)/directory-ok.xpm	\
+	$(srcdir)/directory.xpm		\
+	$(srcdir)/multi.xpm		\
+	$(srcdir)/multi-ok.xpm
 
 #
 # These objects from ../src do not depend on HAVE_X / HAVE_GNOME??
@@ -180,7 +180,7 @@ install_gmc: all
 	$(mcsrcdir)/xmkdir $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) gmc $(DESTDIR)$(bindir)/$(binprefix)gmc
 	$(INSTALL_DATA) $(ICONS) $(DESTDIR)$(icondir)
-	-$(INSTALL_DATA) layout $(DESTDIR)$(libdir)
+	-$(INSTALL_DATA) $(srcdir)/layout $(DESTDIR)$(libdir)
 
 uninstall: 
 	-$(RMF) $(DESTDIR)$(bindir)/$(binprefix)gmc
diff --git a/gnome/gtools.c b/gnome/gtools.c
index eabe01028..2e81ecac6 100644
--- a/gnome/gtools.c
+++ b/gnome/gtools.c
@@ -143,7 +143,7 @@ translate_gdk_keysym_to_curses (GdkEventKey *event)
 		return KEY_BACKSPACE;
 	case GDK_Tab:
 		if (event->state & GDK_SHIFT_MASK)
-			return '\t'; /* return KEY_BACKTAB */
+			return '\t'; /* return KEY_BTAB */
 		return '\t';
 	case GDK_KP_Enter:
 	case GDK_Return:
diff --git a/src/ChangeLog b/src/ChangeLog
index 00d7ccb1d..41589ffe8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -12,6 +12,23 @@ Mon Mar 23 08:17:55 1998 Pavel Roskin <pavel@absolute.spb.su>
 	
 	* myslang.h: using fast one_vline() and one_hline() for OS2_NT
 	
+Mon Mar 23 00:47:51 1998  Norbert Warmuth  <k3190@fh-sw.de>
+
+	* autogen.sh: added support for builddir != srcdir
+
+	* doc/Makefile.in: The manual pages are generated files and
+	located in the builddir and not in the srcdir.
+
+	* find.c (find_file): Use the same hotkey for the panelize button
+	as we use with the external panelize command.
+
+Fri Mar 20 17:51:01 1998  Norbert Warmuth  <k3190@fh-sw.de>
+
+	* myslang.h: --with-ncurses didn't compile: renamed
+	KEY_BACKTAB to KEY_BTAB (the name ncurses uses)
+
+	* dlg.c (dlg_key_event): likewise
+
 1998-03-19  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* screen.c: Remove KEY_DC forever.  This should have never been
diff --git a/src/dlg.c b/src/dlg.c
index 3330c4e83..2b823aaba 100644
--- a/src/dlg.c
+++ b/src/dlg.c
@@ -644,7 +644,7 @@ void dlg_key_event (Dlg_head *h, int d_key)
     int handled;
     
     /* TAB used to cycle */
-    if (!h->raw && (d_key == '\t' || d_key == KEY_BACKTAB))
+    if (!h->raw && (d_key == '\t' || d_key == KEY_BTAB))
 	if (d_key == '\t')
 	    dlg_one_down (h);
         else
diff --git a/src/find.c b/src/find.c
index 3df1b134c..fd4c44df0 100644
--- a/src/find.c
+++ b/src/find.c
@@ -663,7 +663,7 @@ find_file (char *start_dir, char *pattern, char *content, char **dirname,  char
     add_widgetl (find_dlg,
     button_new (FIND2_Y-3, 17, B_VIEW, NORMAL_BUTTON, "&View - F3", find_do_view_file, find_dlg, "button-view"), 0);
     add_widgetl (find_dlg,
-	button_new (FIND2_Y-3, 3, B_PANELIZE, NORMAL_BUTTON, "&Panelize", 0, 0, "button-panelize"),
+	button_new (FIND2_Y-3, 3, B_PANELIZE, NORMAL_BUTTON, "Pane&lize", 0, 0, "button-panelize"),
 	XV_WLAY_CENTERROW);
     add_widgetl (find_dlg, button_new (FIND2_Y-4, 37, B_CANCEL, NORMAL_BUTTON, "&Quit", 0, 0, "button-quit"), 
         XV_WLAY_RIGHTOF);
diff --git a/src/myslang.h b/src/myslang.h
index f0d169b49..61c42c71b 100644
--- a/src/myslang.h
+++ b/src/myslang.h
@@ -11,7 +11,7 @@ enum {
     KEY_BACKSPACE = 400,
     KEY_END, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT,
     KEY_HOME, KEY_A1, KEY_C1, KEY_NPAGE, KEY_PPAGE, KEY_IC,
-    KEY_ENTER, KEY_DC, KEY_SCANCEL, KEY_BACKTAB
+    KEY_ENTER, KEY_DC, KEY_SCANCEL, KEY_BTAB
 };
 
 #define KEY_F(x) 1000+x
diff --git a/tk/ChangeLog b/tk/ChangeLog
index 9e2d48c0c..3ceb474cb 100644
--- a/tk/ChangeLog
+++ b/tk/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 20 18:41:40 1998  Norbert Warmuth  <k3190@fh-sw.de>
+
+	* tkmain.c (x_init_dlg): added dummy function to make it
+	compile
+
 Mon Mar 16 13:05:47 1998  Pavel Roskin <pavel@absolute.spb.su>
 
 	* tkview.c: Include stdio.h;  Minor spelling corrections added. 
diff --git a/tk/tkmain.c b/tk/tkmain.c
index 0e09ed8ff..db072439a 100644
--- a/tk/tkmain.c
+++ b/tk/tkmain.c
@@ -329,6 +329,11 @@ x_focus_widget (Widget_Item *p)
     tk_evalf ("focus %s", wname+1);
 }
 
+void
+x_unfocus_widget (Widget_Item *p)
+{
+}
+
 /* Setup done before using tkrundlg_event */
 void
 x_init_dlg (Dlg_head *h)
diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 550e57063..d3a37626c 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 23 00:42:21 1998  Christofer Edvardsen <ce@earthling.net>
+
+	* Makefile.in, extfs/extfs.ini, extfs/hp48: New external
+	filesystem to view and copy files to/from the HP48.
+
 Wed Feb 11 14:09:02 1998  Oleg <oleg@pobox.com>
 
 	* extfs.c: Add support for writtable external file systems.
diff --git a/vfs/Makefile.in b/vfs/Makefile.in
index 8a890e0b7..e83cc18d7 100644
--- a/vfs/Makefile.in
+++ b/vfs/Makefile.in
@@ -29,7 +29,7 @@ VFSHDRS = vfs.h mcfs.h tcputil.h tar.h container.h ftpfs.h names.h \
 VFSOBJS = $(NONETFILES) @NETFILES@
 
 EXTFSSTUFF = README extfs.ini a cpio.in deb.in ftplist.in lha.in lslR.in \
-	rar.in rpm zip.in zoo.in arfs patchfs mailfs 
+	rar.in rpm zip.in zoo.in arfs patchfs mailfs hp48
 
 #
 # Distribution variables
@@ -100,7 +100,8 @@ install.extfs:
 	$(INSTALL_PROGRAM) $(srcdir)/extfs/a $(DESTDIR)$(libdir)/extfs/a
 	$(INSTALL_PROGRAM) $(srcdir)/extfs/arfs $(DESTDIR)$(libdir)/extfs/arfs
 	$(INSTALL_PROGRAM) $(srcdir)/extfs/rpm  $(DESTDIR)$(libdir)/extfs/rpm
-
+	$(INSTALL_PROGRAM) $(srcdir)/extfs/hp48  $(DESTDIR)$(libdir)/extfs/hp48
+	
 	$(INSTALL_PROGRAM) extfs/cpio $(DESTDIR)$(libdir)/extfs/cpio
 	$(INSTALL_PROGRAM) extfs/deb  $(DESTDIR)$(libdir)/extfs/deb
 	$(INSTALL_PROGRAM) extfs/ftplist $(DESTDIR)$(libdir)/extfs/ftplist
@@ -112,6 +113,7 @@ install.extfs:
 
 uninstall:
 	-$(RMF) $(DESTDIR)$(libdir)/extfs/rpm
+	-$(RMF) $(DESTDIR)$(libdir)/extfs/hp48
 	-$(RMF) $(DESTDIR)$(libdir)/extfs/cpio
 	-$(RMF) $(DESTDIR)$(libdir)/extfs/deb
 	-$(RMF) $(DESTDIR)$(libdir)/extfs/zip
diff --git a/vfs/extfs/extfs.ini b/vfs/extfs/extfs.ini
index 974ec4b5e..114dac79d 100644
--- a/vfs/extfs/extfs.ini
+++ b/vfs/extfs/extfs.ini
@@ -14,3 +14,4 @@ lslR=lslR ls-lR lslR.gz ls-lR.gz lslR.Z ls-lR.Z
 ftplist=ftplist
 patch=
 arfs=.a
+hp48:=hp48
diff --git a/vfs/extfs/hp48 b/vfs/extfs/hp48
new file mode 100644
index 000000000..14c9c53b7
--- /dev/null
+++ b/vfs/extfs/hp48
@@ -0,0 +1,85 @@
+#!/bin/sh
+#
+# Written by Christofer Edvardsen <ce@earthling.net>, Feb 1998
+#
+# This script makes it possible to view and copy files to/from a hp48
+# (tested with a HP48G and the emulator x48)
+# To make "cd hp48:" work add this to extfs.ini: hp48:=hp48
+# 
+
+# Make sure you have kermit installed and that it's using the right serial
+# device by changing /dev/ttyXX on the next line
+KERMIT="kermit -l /dev/ttyS1 -b 9600"
+AWK=mawk
+
+hp48_cmd()
+{
+$KERMIT -C "SET EXIT WARNING OFF,REMOTE $*,QUIT"
+}
+
+hp48_cd()
+{
+(echo SET EXIT WARNING OFF;echo REMOTE HOST HOME
+for HP48_DIR in `echo $*|tr '/' ' '`;do
+ if [ "$HP48_DIR" != "." ];then echo REMOTE HOST $HP48_DIR;fi
+done
+echo QUIT)| $KERMIT -B >/dev/null
+}
+
+hp48_retdir()
+{
+echo $1
+}
+
+hp48_retsize()
+{
+printf "%d" $2 2>/dev/null
+}
+
+hp48_parser()
+{
+HP48_DIRS=
+read INPUT
+while [ "$INPUT" != "EOF" ]
+do
+    case `echo $INPUT|$AWK '{if (int($2)) if ($3=="Directory") print "dir";else print "file"}'` in
+    dir) HP48_DIRS="$HP48_DIRS `hp48_retdir $INPUT`"
+    printf "drwxr-xr-x   1 %-8d %-8d %8d %s %s\n" 0 0 `hp48_retsize $INPUT` "`date +\"%b %d %Y %k:%M"`" "$HP48_CDIR/`hp48_retdir $INPUT`";;
+    file) printf "-rw-r--r--   1 %-8d %-8d %8d %s %s\n" 0 0 `hp48_retsize $INPUT` "`date +"%b %d %Y %k:%M"`" "$HP48_CDIR/`hp48_retdir $INPUT`";;
+    esac
+    read INPUT
+done
+for HP48_DIR in $HP48_DIRS;do 
+ HP48_PDIR=$HP48_CDIR
+ HP48_CDIR=$HP48_CDIR/$HP48_DIR; hp48_cmd HOST $HP48_DIR >/dev/null
+ hp48_list
+ HP48_CDIR=$HP48_PDIR; hp48_cmd HOST UPDIR >/dev/null
+done
+}
+
+hp48_list()
+{
+(hp48_cmd DIRECTORY;echo;echo EOF)|hp48_parser
+}
+
+# override any locale for dates
+LC_ALL=C
+export LC_ALL
+
+case $1 in
+list) HP48_CDIR=
+    hp48_cmd HOST HOME >/dev/null
+    hp48_list
+    exit 0;;
+copyout)
+    cd `dirname $4`
+    hp48_cd `dirname $3`
+    $KERMIT -B -g `basename $3` -a $4 >/dev/null
+    exit 0;;
+copyin) 
+    cd `dirname $4`
+    hp48_cd `dirname $3`
+    $KERMIT -B -s $4 -a `basename $3` >/dev/null
+    exit 0;;
+esac
+exit 1