diff --git a/ChangeLog b/ChangeLog
index 536ce428..7fc9a65f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ v0.39.4		08-Dec-2003
 		Cleanup in main makefile, added help.
 		Revised configure and all Makefiles for better support of
 		linking with threads libraries.
+		Changed endian tests using the configure script.
 
 	upgrade:
 		If you didn't change anything of the language defaults then
diff --git a/INSTALL.in b/INSTALL.in
index bc1acbfa..02b4c05a 100644
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -18,7 +18,7 @@ universal setup on most distributions.
 Login as root and type the following commands to do the basic install:
 
 cd /tmp
-tar xfvz /pathtopackage/@PACKAGE@-@VERSION@.tar.gz
+tar xfvj /@prefix@/@PACKAGE@-@VERSION@.tar.bz2
 cd @PACKAGE@-@VERSION@ 
 bash ./SETUP.sh
 
@@ -27,7 +27,7 @@ necessary users. If this in successfull, logout and login as user "mbse".
 To build and install mbse bbs type the following commands:
 
 cd
-tar xfvz /pathtopackage/@PACKAGE@-@VERSION@.tar.gz
+tar xfvj /pathtopackage/@PACKAGE@-@VERSION@.tar.bz2
 cd @PACKAGE@-@VERSION@
 ./configure
 make
@@ -50,7 +50,7 @@ Login as user "mbse", backup your bbs configuration, and then type the
 following commands:
 
 cd
-tar xfvz /pathtopackage/@PACKAGE@-@VERSION@.tar.gz
+tar xfvj /pathtopackage/@PACKAGE@-@VERSION@.tar.bz2
 cd @PACKAGE@-@VERSION@
 ./configure
 make
diff --git a/README b/README
index 96e800a0..af28e6e6 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ $Id$
 
 Distribution naming scheme:
 
-mbsebbs-0.33.18.tar.gz
+mbsebbs-0.33.18.tar.bz2
   |     | |  |
   |     | |  +-------- minor patchlevel 
   |     | +----------- minor version
@@ -22,4 +22,7 @@ The even minor version numbers will be stable releases, they will be available
 at http://www.mbse.dds.nl and at 2:280/2802. The first version using this
 scheme is 0.36.00
 
+For first time installing, see the file INSTALL. After installation, the html
+guide is installed in /opt/mbse/html.
+
 
diff --git a/html/basic.html.in b/html/basic.html.in
index 8c58b64e..8e034fc5 100644
--- a/html/basic.html.in
+++ b/html/basic.html.in
@@ -169,7 +169,7 @@ While in mbse's home directory (/opt/mbse) unpack the distribution archives:
 tar xfvz /path/to/mbsebbs-@VERSION@.tar.bz2
 </pre>
 You now have the subdirectory with sources in the right place. 
-Next build the binaries and install them using the folowing commands:
+Next build the binaries and install them using the following commands:
 <pre>
 cd ~/mbsebbs-@VERSION@
 ./configure
diff --git a/lib/endian.c b/lib/endian.c
index 43193021..ef6945ab 100644
--- a/lib/endian.c
+++ b/lib/endian.c
@@ -41,22 +41,11 @@
  */
 int le_int(int val)
 {
-#ifdef BYTE_ORDER
-    if (BYTE_ORDER == 1234) {
-	return val;
-    } else if (BYTE_ORDER == 4321) {
+#ifdef WORDS_BIGENDIAN
 	return ((val & 0xff) << 24) | (((val >> 8) & 0xff) << 16) | (((val >> 16) & 0xff) << 8) | ((val >> 24) & 0xff);
-    } else {
-#endif
-#ifdef __i386__
-	return val;
 #else
-	return ((val & 0xff) << 24) | (((val >> 8) & 0xff) << 16) | (((val >> 16) & 0xff) << 8) | ((val >> 24) & 0xff);
+	return val;
 #endif
-#ifdef BYTE_ORDER
-    }
-#endif
-    return val;
 }
 
 
diff --git a/mbcico/hydra.c b/mbcico/hydra.c
index 6a6f2311..1eead453 100644
--- a/mbcico/hydra.c
+++ b/mbcico/hydra.c
@@ -109,15 +109,14 @@ static int txoptions, rxoptions;
 
 static char *put_long(char *buffer, long val)
 {
-#if defined(__i386__)
-    *(unsigned long *) buffer = (unsigned long) val;
-#else
+#ifdef WORDS_BIGENDIAN
     buffer[0] =  (unsigned long) val & 0xff;
     buffer[1] = ((unsigned long) val >> 8) & 0xff;
     buffer[2] = ((unsigned long) val >> 16) & 0xff;
     buffer[3] = ((unsigned long) val >> 24) & 0xff;
+#else
+    *(unsigned long *) buffer = (unsigned long) val;
 #endif
-
     return buffer;
 }
 
@@ -125,11 +124,11 @@ static char *put_long(char *buffer, long val)
 
 static long get_long(char *buffer)
 {
-#if defined(__i386__)
-    return *(long *) buffer;
-#else
+#ifdef WORDS_BIGENDIAN
     return ((unsigned long) ((unsigned char) buffer[0])) | ((unsigned long) ((unsigned char) buffer[1]) << 8) |
 	   ((unsigned long) ((unsigned char) buffer[2]) << 16) | ((unsigned long) ((unsigned char) buffer[3]) << 24);
+#else
+    return *(long *) buffer;
 #endif
 }