diff -ur vnc-3.3.2r3-clean/Xvnc/config/cf/Imake.cf vnc-3.3.2r3/Xvnc/config/cf/Imake.cf
--- vnc-3.3.2r3-clean/Xvnc/config/cf/Imake.cf	Sat Jul 26 22:41:02 1997
+++ vnc-3.3.2r3/Xvnc/config/cf/Imake.cf	Mon Apr 26 17:57:25 1999
@@ -552,6 +552,10 @@
 #  define AlphaArchitecture
 #  undef __alpha
 # endif /* __alpha */
+# ifdef arm
+#  define ArmArchitecture
+#  undef arm
+# endif /* arm */
 # ifdef mc68000
 #  define Mc68020Architecture
 #  undef mc68000
diff -ur vnc-3.3.2r3-clean/Xvnc/config/cf/linux.cf vnc-3.3.2r3/Xvnc/config/cf/linux.cf
--- vnc-3.3.2r3-clean/Xvnc/config/cf/linux.cf	Mon May 11 12:38:06 1998
+++ vnc-3.3.2r3/Xvnc/config/cf/linux.cf	Mon Apr 26 17:44:53 1999
@@ -40,7 +40,7 @@
 
 /* Set some defaults for the Default* values in case imake doesn't find them */
 #ifndef DefaultLinuxCLibMajorVersion
-#ifdef AlphaArchitecture
+#if defined(AlphaArchitecture) || defined(ArmArchitecture)
 #define DefaultLinuxCLibMajorVersion	6
 #else
 #define DefaultLinuxCLibMajorVersion	5
@@ -197,6 +197,13 @@
 #define AsmDefines		-D__ELF__
 #define CplusplusCmd		c++ -b alpha-linux
 #endif /* AlphaArchitecture */
+#ifdef ArmArchitecture
+#define CcCmd			gcc -b arm-linuxelf
+#define AsCmd			/usr/arm-linuxelf/bin/as
+#define LdCmd			ld -m elf32arm
+#define AsmDefines		-D__ELF__
+#define CplusplusCmd		c++ -b arm-linuxelf
+#endif /* ArmArchitecture */
 #ifdef i386Architecture
 #define CcCmd			gcc -b i486-linux
 #define AsCmd			/usr/i486-linux/bin/as
@@ -251,6 +258,13 @@
 #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
 #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
 #endif /* AlphaArchitecture */
+
+#ifdef ArmArchitecture
+#define OptimizedCDebugFlags	-O2 -fsigned-char -fomit-frame-pointer
+#define LinuxMachineDefines	-D__arm__
+#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
+#define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
+#endif /* ArmArchitecture */
 
 #ifdef Mc68020Architecture
 #define OptimizedCDebugFlags	-O2
diff -ur vnc-3.3.2r3-clean/Xvnc/config/imake/imake.c vnc-3.3.2r3/Xvnc/config/imake/imake.c
--- vnc-3.3.2r3-clean/Xvnc/config/imake/imake.c	Mon Mar  2 06:55:22 1998
+++ vnc-3.3.2r3/Xvnc/config/imake/imake.c	Mon Apr 26 17:41:40 1999
@@ -952,7 +952,7 @@
   FILE* inFile;
 {
   FILE* ldprog = popen ("ld -v", "r");
-  char c;
+  int c;
   int ldmajor, ldminor;
 
   if (ldprog) {