diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,1 +1,70 @@
-SUBDIRS = common server client . tests
+
+SUBDIRS = . tests
+
+AM_CPPFLAGS = -DSYSCONFDIR='"$(sysconfdir)"' \
+	-DLOCALSTATEDIR='"$(localstatedir)"' \
+	-DRUNSTATEDIR='"$(localstatedir)/run"' \
+	-I. -I$(top_srcdir)/src/common
+AM_CFLAGS = $(DISTLIBS_CFLAGS)
+AM_LDFLAGS = $(DISTLIBS_LDFLAGS)
+# LIBS, LDFLAGS, Huh!?
+LIBS = $(DISTLIBS_LDADD)
+LDADD = libdistrencommon.la
+
+include_HEADERS = client/distren.h
+
+bin_PROGRAMS = distren
+if ENABLE_SERVER
+bin_PROGRAMS += distrend distrenslave
+endif
+
+lib_LTLIBRARIES = libdistren.la
+pkglib_LTLIBRARIES = libdistrencommon.la
+
+# libdistrencommon.la:
+libdistrencommon_la_SOURCES = common/options.c \
+	common/options.h \
+	common/execio.h \
+	common/execio.c \
+	common/remoteio.h \
+	common/libremoteio.h \
+	common/remoteio.c \
+	common/asprintf.h \
+	common/asprintf.c
+#see http://sources.redhat.com/autobook/autobook/autobook_91.html
+# either increase the revision number or the interface number each release!
+libdistrencommon_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0
+
+# libdistren.la:
+libdistren_la_SOURCES = $(include_HEADERS) \
+	client/libdistren.h \
+	client/libdistren.c \
+	client/libdistren_job.c \
+	client/libdistren_unbias.c \
+	client/libdistren_config.c
+libdistren_la_LIBADD = libdistrencommon.la
+libdistren_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0
+
+# distren:
+distren_SOURCES = client/distren.c
+distren_LDADD = libdistren.la
+
+# shared server sources:
+SERVER_SOURCES = server/slavefuncs.c \
+	server/slavefuncs.h \
+	server/distrenjob.c \
+	server/distrenjob.h
+# distrend:
+distrend_SOURCES = $(SERVER_SOURCES) \
+	server/distrend.c \
+	server/distrend.h \
+	server/user_mgr.c \
+	server/user_mgr.h \
+	server/listen.h \
+	server/listen.c
+distrend_LDADD = libdistrencommon.la
+# distrenslave:
+distrenslave_SOURCES = $(SERVER_SOURCES) \
+	server/slave.c
+distrenslave_LDADD = libdistrencommon.la
+