diff --git a/configure.in b/configure.in
index ae1182f03..224abe15d 100644
--- a/configure.in
+++ b/configure.in
@@ -1331,7 +1331,6 @@ AC_OUTPUT([ \
  src/mime/Makefile \
  src/mime/backend/Makefile \
  src/scripting/Makefile \
- src/util/Makefile \
  src/viewer/Makefile \
  src/viewer/text/Makefile
 ])
diff --git a/src/util/Makefile b/src/util/Makefile
new file mode 100644
index 000000000..fe6c3b670
--- /dev/null
+++ b/src/util/Makefile
@@ -0,0 +1,52 @@
+path_to_top=../..
+include $(path_to_top)/Makefile.config
+
+ifeq ($(CONFIG_DEBUG),yes)
+debugobj = memdebug.o
+endif
+
+ifeq ($(CONFIG_MD5),yes)
+md5obj = md5.o
+endif
+
+ifeq ($(CONFIG_SCANNER),yes)
+scannerobj = scanner.o
+endif
+
+ifeq ($(CONFIG_SHA1),yes)
+sha1obj = sha1.o
+endif
+
+ifeq ($(CONFIG_SMALL),yes)
+else
+fastfindobj = fastfind.o
+endif
+
+ifeq ($(CONFIG_MOUSE),yes)
+mouseobj = mouse.o
+endif
+
+OBJS = \
+ base64.o \
+ color.o \
+ conv.o \
+ env.o \
+ error.o \
+ file.o \
+ hash.o \
+ memlist.o \
+ memory.o \
+ secsave.o \
+ snprintf.o \
+ string.o \
+ time.o \
+ $(debugobj) \
+ $(fastfindobj) \
+ $(md5obj) \
+ $(scannerobj) \
+ $(sha1obj)
+
+all-l: libutil.a
+libutil.a: $(OBJS)
+
+include $(path_to_top)/Makefile.lib
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
deleted file mode 100644
index 94e28dedb..000000000
--- a/src/util/Makefile.am
+++ /dev/null
@@ -1,82 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.53 2005/08/17 15:26:22 jonas Exp $
-
-include $(top_srcdir)/Makefile.base
-
-if CONFIG_DEBUG
-debugobj = memdebug.o
-endif
-
-if CONFIG_MD5
-md5obj = md5.o
-endif
-
-if CONFIG_SCANNER
-scannerobj = scanner.o
-endif
-
-if CONFIG_SHA1
-sha1obj = sha1.o
-endif
-
-if CONFIG_SMALL
-else
-fastfindobj = fastfind.o
-endif
-
-noinst_LIBRARIES = libutil.a
-
-EXTRA_libutil_a_SOURCES = \
- fastfind.c \
- fastfind.h \
- md5.c \
- md5.h \
- memdebug.c \
- memdebug.h \
- scanner.c \
- scanner.h \
- sha1.c \
- sha1.h
-
-libutil_a_LIBADD = \
- $(debugobj) \
- $(fastfindobj) \
- $(md5obj) \
- $(scannerobj) \
- $(sha1obj)
-
-libutil_a_SOURCES = \
- align.h \
- base64.c \
- base64.h \
- bitfield.h \
- box.h	\
- color.c \
- color.h \
- color.inc \
- color_s.inc \
- conv.c \
- conv.h \
- env.c \
- env.h \
- error.c \
- error.h \
- file.c \
- file.h \
- hash.c \
- hash.h \
- lists.h \
- math.h \
- memlist.c \
- memlist.h \
- memory.c \
- memory.h \
- profile.h \
- secsave.c \
- secsave.h \
- snprintf.c \
- snprintf.h \
- string.c \
- string.h \
- time.c \
- time.h