diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,12 @@ AM_PATH_XML2(2.7.2)
 
 PKG_PROG_PKG_CONFIG(0.17.2)
 
+AC_CHECK_MYSQLR
 PKG_CHECK_MODULES(DISTLIBS, libconfuse >= 2.6)
 
+AC_SUBST([MYSQL_LIBS])
+AC_SUBST([MYSQL_CFLAGS])
+
 AC_CONFIG_FILES([Makefile
 src/Makefile
 src/common/Makefile
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,4 +1,4 @@
 bin_PROGRAMS = distrend
 distrend_SOURCES = distrend.c
-distrend_LDADD = @DISTLIBS_LIBS@ @top_builddir@/src/common/libdistren.la
-distrend_CFLAGS = @DISTLIBS_CFLAGS@ -I@top_srcdir@/src/common
+distrend_LDADD = @DISTLIBS_LIBS@ @MYSQL_LIBS@ @top_builddir@/src/common/libdistren.la
+distrend_CFLAGS = @DISTLIBS_CFLAGS@ @MYSQL_CFLAGS@ -I@top_srcdir@/src/common
diff --git a/src/server/distrend.c b/src/server/distrend.c
--- a/src/server/distrend.c
+++ b/src/server/distrend.c
@@ -18,12 +18,9 @@
 
 */
 
-#include <my_global.h> /* This provides windows compat too */
-#include <my_sys.h>
 #include <mysql.h>
 #include <stdio.h>
 
-
 /* Just some notes -- Ethan Zonca
  *
  * So I read the IRC transcript, and we need some communication and plugin (e.g., blender, povray) standards.
@@ -73,7 +70,7 @@ int main(int argc, char *argv[])
 	if (conn == NULL)
 	{
 	    fprintf (stderr, "mysql_init() failed (probably out of memory)\n");
-	    exit (1);
+	    return 1;
 	}
 	/* connect to server */
 	if (mysql_real_connect (conn, opt_host_name, opt_user_name, opt_password,
@@ -81,7 +78,7 @@ int main(int argc, char *argv[])
 	{
 	    fprintf (stderr, "mysql_real_connect() failed\n");
 	    mysql_close (conn);
-	    exit (1);
+	    return 1;
 	}
 	/* disconnect from server */
 	mysql_close (conn);
@@ -90,4 +87,3 @@ int main(int argc, char *argv[])
   return 0;
 }
 
-\