diff --git a/configure.in b/configure.in
index ad9e0e95..2bcf895a 100644
--- a/configure.in
+++ b/configure.in
@@ -1329,9 +1329,7 @@ AC_OUTPUT([ \
  src/intl/gettext/ref-add.sed \
  src/intl/gettext/ref-del.sed \
  src/mime/Makefile \
- src/mime/backend/Makefile \
- src/viewer/Makefile \
- src/viewer/text/Makefile
+ src/mime/backend/Makefile
 ])
 
 
diff --git a/src/viewer/Makefile b/src/viewer/Makefile
new file mode 100644
index 00000000..00c12919
--- /dev/null
+++ b/src/viewer/Makefile
@@ -0,0 +1,26 @@
+path_to_top=../..
+include $(path_to_top)/Makefile.config
+
+SUBDIRS = dump text
+
+ifeq ($(CONFIG_MARKS),yes)
+marksobj = text/marks.o
+endif
+
+OBJS = \
+ action.o \
+ timer.o \
+ dump/dump.o \
+ text/draw.o \
+ text/form.o \
+ text/link.o \
+ $(marksobj) \
+ text/search.o \
+ text/textarea.o \
+ text/view.o \
+ text/vs.o
+
+all-l: libviewer.a
+libviewer.a: $(OBJS)
+
+include $(path_to_top)/Makefile.lib
diff --git a/src/viewer/Makefile.am b/src/viewer/Makefile.am
deleted file mode 100644
index fa31f0ac..00000000
--- a/src/viewer/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.3 2005/06/13 21:21:10 jonas Exp $
-
-include $(top_srcdir)/Makefile.base
-
-SUBDIRS = dump text
-
-if CONFIG_MARKS
-marksobj = text/marks.o
-endif
-
-noinst_LIBRARIES = libviewer.a
-libviewer_a_LIBADD = \
- dump/dump.o \
- text/draw.o \
- text/form.o \
- text/link.o \
- $(marksobj) \
- text/search.o \
- text/textarea.o \
- text/view.o \
- text/vs.o
-
-libviewer_a_SOURCES = \
- action.c \
- action.h \
- timer.c \
- timer.h
-
diff --git a/src/viewer/text/Makefile b/src/viewer/text/Makefile
new file mode 100644
index 00000000..9509438e
--- /dev/null
+++ b/src/viewer/text/Makefile
@@ -0,0 +1,13 @@
+path_to_top=../../..
+include $(path_to_top)/Makefile.config
+
+ifeq ($(CONFIG_MARKS),yes)
+marksobj = marks.o
+endif
+
+OBJS = draw.o form.o link.o $(marksobj) search.o textarea.o view.o vs.o
+
+# Do not forget to also add the .o to ../Makefile. Yes, it sucks.
+all-l: $(OBJS)
+
+include $(path_to_top)/Makefile.lib
diff --git a/src/viewer/text/Makefile.am b/src/viewer/text/Makefile.am
deleted file mode 100644
index 21dbd547..00000000
--- a/src/viewer/text/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.10 2004/06/23 08:16:23 jonas Exp $
-
-include $(top_srcdir)/Makefile.base
-
-if CONFIG_MARKS
-marksobj = marks.o
-endif
-
-noinst_LIBRARIES = libviewer_text.a
-
-EXTRA_libviewer_text_a_SOURCES = marks.c marks.h
-libviewer_text_a_LIBADD = $(marksobj)
-
-libviewer_text_a_SOURCES = \
- draw.c \
- draw.h \
- form.c \
- form.h \
- link.c \
- link.h \
- search.c \
- search.h \
- textarea.c \
- textarea.h \
- view.c \
- view.h \
- vs.c \
- vs.h
-