diff --git a/src/modules/Image/Makefile.in b/src/modules/Image/Makefile.in
index 5de4a045a56ff22757a7cfd63faa4fb3c0f099d4..7aa03bc5a29c5c2c8f429a9d5c0c044b148e623d 100644
--- a/src/modules/Image/Makefile.in
+++ b/src/modules/Image/Makefile.in
@@ -4,7 +4,7 @@ OBJS = image.o font.o togif.o matrix.o pnm.o blit.o \
 	pattern.o dct.o operator.o x.o colortable.o polyfill.o 
 MODNAME=image
 MODULE_SUBDIRS=encodings
-MODULE_ARCHIVES=encodings/gif.a encodings/pnm.a
+MODULE_ARCHIVES=encodings/gif.a encodings/pnm.a encodings/png.a encodings/x.a
 MODULE_LDFLAGS=@LDFLAGS@
 
 @SET_MAKE@
diff --git a/src/modules/Image/encodings/Makefile.in b/src/modules/Image/encodings/Makefile.in
index 3a8b2e87a9d82562599ecf83dbee0829e64b85b0..50528e782fb6d4ed57c25926d17a3ead7c92f101 100644
--- a/src/modules/Image/encodings/Makefile.in
+++ b/src/modules/Image/encodings/Makefile.in
@@ -4,7 +4,8 @@ GIF_OBJS = gif.o gif_lzw.o png.o
 JPEG_OBJS = jpeg.o
 PNG_OBJS = png.o
 PNM_OBJS = pnm.o 
-OBJS=gif.a pnm.a png.a
+X_OBJS = x.o
+OBJS=gif.a pnm.a png.a x.a
 
 @SET_MAKE@
 
@@ -23,6 +24,11 @@ gif.a : $(GIF_OBJS)
 	$(AR) cq gif.a $(GIF_OBJS)
 	$(RANLIB) gif.a
 
+x.a : $(X_OBJS)
+	rm -f x.a
+	$(AR) cq x.a $(X_OBJS)
+	$(RANLIB) x.a
+
 png.a : $(PNG_OBJS)
 	rm -f png.a
 	$(AR) cq png.a $(PNG_OBJS)
diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c
index 90e2898250b49d625088f38c2909fc2c1d64540b..154cb7cb92f1b7671b46315dbe12d4a63d8a135b 100644
--- a/src/modules/Image/image.c
+++ b/src/modules/Image/image.c
@@ -1,9 +1,9 @@
-/* $Id: image.c,v 1.70 1997/12/22 23:26:46 hubbe Exp $ */
+/* $Id: image.c,v 1.71 1998/01/07 01:11:26 mirar Exp $ */
 
 /*
 **! module Image
 **! note
-**!	$Id: image.c,v 1.70 1997/12/22 23:26:46 hubbe Exp $
+**!	$Id: image.c,v 1.71 1998/01/07 01:11:26 mirar Exp $
 **! class image
 **!
 **!	The main object of the <ref>Image</ref> module, this object
@@ -82,7 +82,7 @@
 
 #include "stralloc.h"
 #include "global.h"
-RCSID("$Id: image.c,v 1.70 1997/12/22 23:26:46 hubbe Exp $");
+RCSID("$Id: image.c,v 1.71 1998/01/07 01:11:26 mirar Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
@@ -2981,6 +2981,7 @@ void pike_module_init(void)
    init_image_gif();
    init_image_pnm();
    init_image_png();
+   init_image_x();
 }
 
 void pike_module_exit(void) 
@@ -2996,6 +2997,7 @@ void pike_module_exit(void)
   exit_image_gif();
   exit_image_pnm();
   exit_image_png();
+  exit_image_x();
 }