diff --git a/configure.in b/configure.in
index 6c5e60b6..34f83f3d 100644
--- a/configure.in
+++ b/configure.in
@@ -130,9 +130,13 @@ AC_ARG_ENABLE(tcl,
         tcl=$enableval, tcl=yes)
 
 AC_ARG_ENABLE(sasl,
-[  --disable-sasl           disable the SASL plugin],
+[  --disable-sasl          disable the SASL plugin],
         sasl=$enableval, sasl=yes)
 
+AC_ARG_ENABLE(doat,
+[  --disable-doat          disable the Do At plugin],
+        doat=$enableval, doat=yes)
+
 AC_ARG_ENABLE(plugin,
 [  --disable-plugin        disable plugin support],
         plugin=$enableval, plugin=yes)
@@ -381,6 +385,21 @@ AC_MSG_CHECKING(for plugin interface used by SASL)
 	fi
 fi
 
+dnl *********************************************************************
+dnl ** DO AT ************************************************************
+dnl *********************************************************************
+
+if test "$doat" != "no"; then
+AC_MSG_CHECKING(for plugin interface used by Do At)
+	doat=no
+	if test "$plugin" = yes; then
+		doat=yes
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for Do At])
+	fi
+fi
+
 dnl *********************************************************************
 dnl ** IPv6 *************************************************************
 dnl *********************************************************************
@@ -595,6 +614,7 @@ AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
 AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes")
 AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes")
 AM_CONDITIONAL(DO_SASL, test "x$sasl" = "xyes")
+AM_CONDITIONAL(DO_DOAT, test "x$doat" = "xyes")
 AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes")
 AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
 AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno")
@@ -858,6 +878,7 @@ plugins/python/Makefile
 plugins/perl/Makefile
 plugins/tcl/Makefile
 plugins/sasl/Makefile
+plugins/doat/Makefile
 intl/Makefile
 po/Makefile.in
 ])
@@ -880,7 +901,7 @@ echo dbus support ........ : $dbus\	msproxy ntlm \(ISA\) .... : $have_ntlm
 echo libnotify support ... : $libnotify
 echo
 echo Perl ................ : $perl\	SASL .................. : $sasl
-echo Python .............. : $python
+echo Python .............. : $python\	Do At ................. : $doat
 echo Tcl ................. : $tcl
 echo
 echo The binary will be installed in $prefix/bin
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index dd33d8c7..4ac35bce 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -21,5 +21,9 @@ if DO_SASL
 sasldir = sasl
 endif
 
+if DO_DOAT
+doatdir = doat
+endif
+
 #SUBDIRS = . $(pythondir) $(perldir) mailcheck xdcc
-SUBDIRS = . $(pythondir) $(perldir) $(tcldir) $(sasldir)
+SUBDIRS = . $(pythondir) $(perldir) $(tcldir) $(sasldir) $(doatdir)
diff --git a/plugins/doat/Makefile.am b/plugins/doat/Makefile.am
new file mode 100644
index 00000000..8be75450
--- /dev/null
+++ b/plugins/doat/Makefile.am
@@ -0,0 +1,10 @@
+EXTRA_DIST = 
+
+libdir = $(hexchatlibdir)/plugins
+
+lib_LTLIBRARIES = doat.la
+doat_la_SOURCES = doat.c
+doat_la_LDFLAGS = -avoid-version -module 
+doat_la_LIBADD = 
+INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/..
+