diff --git a/cnslock/Makefile b/cnslock/Makefile
deleted file mode 100644
index 5827d5f..0000000
--- a/cnslock/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-INSTALL = /usr/bin/install -m 755
-PREFIX = /usr/local
-
-VERSION = 1.02
-CFLAGS = -O3 -Wall -DVERSION=\"$(VERSION)\" ${EXTRA}
-CC = gcc
-OBJS = cnslock.o kleds.o
-
-LIBS = -lX11 -ldockapp
-
-all: cnslock
-
-cnslock.o: cnslock.c
-	$(CC) $(CFLAGS) -c cnslock.c -o cnslock.o
-
-kleds.o: kleds.c include/kleds.h
-	$(CC) -Wall -I/usr/X11R6/include -c kleds.c -o kleds.o
-
-cnslock: $(OBJS)
-	$(CC) -o cnslock $(OBJS) $(LIBS)
-
-clean:
-	rm -rf cnslock *.o *~ .xvpics
-
-install : cnslock
-	$(INSTALL) cnslock $(PREFIX)/bin
diff --git a/cnslock/Makefile.am b/cnslock/Makefile.am
new file mode 100644
index 0000000..6404d2c
--- /dev/null
+++ b/cnslock/Makefile.am
@@ -0,0 +1,6 @@
+bin_PROGRAMS = cnslock
+cnslock_SOURCES = cnslock.c kleds.c graphics/caps_num_scroll.xpm include/kleds.h
+EXTRA_DIST = CHANGES
+
+AM_CFLAGS = $(x11_CFLAGS) $(dockapp_CFLAGS)
+LIBS += $(x11_LIBS) $(dockapp_LIBS)
diff --git a/cnslock/configure.ac b/cnslock/configure.ac
new file mode 100644
index 0000000..7181c57
--- /dev/null
+++ b/cnslock/configure.ac
@@ -0,0 +1,8 @@
+AC_INIT([cnslock], [1.02], [wmaker-dev@lists.windowmaker.org])
+AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_SRCDIR([configure.ac])
+AC_PROG_CC
+PKG_CHECK_MODULES([x11], [x11])
+PKG_CHECK_MODULES([dockapp], [dockapp])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT