diff --git a/wmmixer/Makefile b/wmmixer/Makefile
deleted file mode 100644
index dd61730..0000000
--- a/wmmixer/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: Makefile,v 1.5 2002/06/25 22:13:09 gordon Exp $
-
-prefix      = /usr/local
-exec_prefix = ${prefix}
-bindir      = ${exec_prefix}/bin
-mandir      = ${prefix}/share/man
-
-DESTDIR     =
-
-CXX	    = g++
-CXXFLAGS    = -O -Wall
-EXTRA_LIBS  = -L/usr/X11R6/lib -lX11 -lXpm -lXext
-
-
-LD 	    = g++
-LDFLAGS     = -o $(EXECUTABLE) $(CXXFLAGS)
-
-EXECUTABLE  = wmmixer
-OBJS	    = xhandler.o mixctl.o wmmixer.o exception.o
-
-INSTALL = install
-INSTALL_FILE    = $(INSTALL) -D -p    -o root -g root  -m  644
-INSTALL_PROGRAM = $(INSTALL) -D -p    -o root -g root  -m  755
-
-.cc.o:
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-$(EXECUTABLE): $(OBJS)
-	$(LD) $(LDFLAGS) $(OBJS) $(EXTRA_LIBDIRS) $(EXTRA_LIBS)
-
-all: $(EXECUTABLE)
-
-clean:
-	rm -f $(OBJS) $(EXECUTABLE)
-
-install: install-bin install-doc
-
-install-bin: wmmixer
-	$(INSTALL_PROGRAM) $< $(DESTDIR)$(bindir)/wmmixer
-
-install-doc: wmmixer.1
-	$(INSTALL_FILE) $< $(DESTDIR)$(mandir)/man1/wmmixer.1
-
-uninstall: uninstall-bin uninstall-doc
-
-uninstall-bin:
-	rm -f $(DESTDIR)$(bindir)/wmmixer
-
-uninstall-doc:
-	rm -f $(DESTDIR)$(mandir)/man1/wmmixer.1
-
-.PHONY: all clean dist-clean install install-bin install-doc \
-	uninstall uninstall-bin uninstall-doc
-
diff --git a/wmmixer/Makefile.am b/wmmixer/Makefile.am
new file mode 100644
index 0000000..6aa9035
--- /dev/null
+++ b/wmmixer/Makefile.am
@@ -0,0 +1,9 @@
+bin_PROGRAMS = wmmixer
+dist_man_MANS = wmmixer.1
+wmmixer_SOURCES = common.h exception.cc exception.h mixctl.cc mixctl.h \
+	wmmixer.cc wmmixer.h xhandler.cc xhandler.h \
+	XPM/icons.xpm XPM/norec.xpm XPM/tile.xpm XPM/wmmixer.xpm
+EXTRA_DIST = CHANGES
+
+AM_CFLAGS = $(Xlib_CFLAGS) $(Xext_CFLAGS) $(libXpm_CFLAGS)
+LIBS += $(Xlib_LIBS) $(Xext_LIBS) $(libXpm_LIBS)
diff --git a/wmmixer/configure.ac b/wmmixer/configure.ac
new file mode 100644
index 0000000..05c939e
--- /dev/null
+++ b/wmmixer/configure.ac
@@ -0,0 +1,9 @@
+AC_INIT([wmmixer], [1.7], [wmaker-dev@lists.windowmaker.org])
+AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_SRCDIR([configure.ac])
+AC_PROG_CXX
+PKG_CHECK_MODULES([Xlib], [x11])
+PKG_CHECK_MODULES([Xext], [xext])
+PKG_CHECK_MODULES([libXpm], [xpm])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/wmmixer/wmmixer.cc b/wmmixer/wmmixer.cc
index 15bef43..74a6cfc 100644
--- a/wmmixer/wmmixer.cc
+++ b/wmmixer/wmmixer.cc
@@ -435,7 +435,7 @@ void WMMixer::displayUsage(const char* name)
 //--------------------------------------------------------------------
 void WMMixer::displayVersion()
 {
-  std::cout << "wmmixer version 1.5" << std::endl;
+  std::cout << "wmmixer version " PACKAGE_VERSION << std::endl;
   exit(0);
 }