--- Imakefile.orig	Fri Jun 13 20:14:21 1997
+++ Imakefile	Mon Jun 30 09:33:33 1997
@@ -44,7 +44,7 @@
 
 XCOMM Only the image.c and bat.c modes use this.
 XCOMM If your system has libXpm, remove the 'XCOMM ' from the next line.
-XCOMM #define XpmLibrary
+#define XpmLibrary
 
 #ifdef XpmLibrary
           XPMDEF = -DUSE_XPM
@@ -59,7 +59,7 @@
 
 XCOMM If you get an error "Cannot find libXpm" while linking, set XPMLIBPATH
 XCOMM to the directory libXpm.* is in.  Below is a guess.
-          XPMLIB = -L/usr/local/lib -lXpm
+          XPMLIB = -lXpm
 
 #endif
 
@@ -174,8 +174,8 @@
 XCOMM SRANDDEF = -DSRAND=srand48
 XCOMM LRANDDEF = -DLRAND=lrand48
 
-XCOMM SRANDDEF = -DSRAND=srandom
-XCOMM LRANDDEF = -DLRAND=random
+SRANDDEF = -DSRAND=srandom
+LRANDDEF = -DLRAND=random
 
 XCOMM Least desirable RNG
 XCOMM SRANDDEF = -DSRAND=srand
@@ -370,11 +370,11 @@
 XCOMM  -DSTAFF_NETGROUP=\"/etc/xlock.netgroup\"  Netgroup that is exempt
 
 XCOMM May have to combine in one long line if "+=" does not work
-        OPTDEF = -DUSE_VROOT -DALWAYS_ALLOW_ROOT -DUSE_BOMB
+XCOMM        OPTDEF = -DUSE_VROOT -DALWAYS_ALLOW_ROOT -DUSE_BOMB
 XCOMM        OPTDEF += -DUSE_SYSLOG -DSYSLOG_FACILITY=LOG_AUTH
 XCOMM        OPTDEF += -DSYSLOG_WARNING=LOG_WARNING
 XCOMM        OPTDEF += -DSYSLOG_NOTICE=LOG_NOTICE -DSYSLOG_INFO=LOG_INFO
-XCOMM        OPTDEF += -DUSE_MOUSE_MOTION
+        OPTDEF += -DUSE_MOUSE_MOTION
 XCOMM        OPTDEF += -DUSE_MULTIPLE_ROOT
 XCOMM        OPTDEF += -DUSE_OLD_EVENT_LOOP
 XCOMM        OPTDEF += -DUSE_XLOCKRC
@@ -403,7 +403,7 @@
 XCOMM IMAGEBITMAP = l-bob #Slackware icon
 XCOMM IMAGEBITMAP = m-xlock #XLock icon
 XCOMM LIFEBITMAP = $(SMALLBITMAP)
-LIFEBITMAP = s-grelb
+LIFEBITMAP = $(SMALLBITMAP)
 LIFE1DBITMAP = $(TINYBITMAP)
 MAZEBITMAP = $(LARGEBITMAP)
 XCOMM MAZEBITMAP = m-xlock