diff --git a/wmcdplay/Imakefile b/wmcdplay/Imakefile
deleted file mode 100644
index 3dfc773..0000000
--- a/wmcdplay/Imakefile
+++ /dev/null
@@ -1,8 +0,0 @@
-DEPLIBS = $(DEPXLIB) 
-
-LOCAL_LIBRARIES = $(XPMLIB) $(XLIB)
-
-SRCS = wmcdplay.cc
-OBJS = wmcdplay.o
-
-ComplexProgramTarget(wmcdplay)
diff --git a/wmcdplay/Makefile.am b/wmcdplay/Makefile.am
new file mode 100644
index 0000000..8cbcfb4
--- /dev/null
+++ b/wmcdplay/Makefile.am
@@ -0,0 +1,4 @@
+bin_PROGRAMS = wmcdplay
+wmcdplay_SOURCES = cdctl.h cdctl_freebsd.h wmcdplay.cc
+AM_CFLAGS = $(x11_CFLAGS) $(xpm_CFLAGS) $(xext_CFLAGS)
+LIBS += $(x11_LIBS) $(xpm_LIBS) $(xext_LIBS)
diff --git a/wmcdplay/configure.ac b/wmcdplay/configure.ac
new file mode 100644
index 0000000..5c69ebe
--- /dev/null
+++ b/wmcdplay/configure.ac
@@ -0,0 +1,9 @@
+AC_INIT([wmcdplay], [1.0beta1])
+AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_SRCDIR([configure.ac])
+AC_PROG_CXX
+PKG_CHECK_MODULES([x11], [x11])
+PKG_CHECK_MODULES([xpm], [xpm])
+PKG_CHECK_MODULES([xext], [xext])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT