diff --git a/guacamole/libguac/AUTHORS b/guacamole/libguac/AUTHORS
new file mode 100644
index 000000000..e69de29bb
diff --git a/guacamole/libguac/COPYING b/guacamole/libguac/COPYING
new file mode 100644
index 000000000..e69de29bb
diff --git a/guacamole/libguac/ChangeLog b/guacamole/libguac/ChangeLog
new file mode 100644
index 000000000..e69de29bb
diff --git a/guacamole/libguac/INSTALL b/guacamole/libguac/INSTALL
new file mode 100644
index 000000000..e69de29bb
diff --git a/guacamole/libguac/Makefile b/guacamole/libguac/Makefile
deleted file mode 100644
index 853e86a3e..000000000
--- a/guacamole/libguac/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-
-CFLAGS+= -fPIC -pedantic -Wall -Werror -Iinclude
-LDFLAGS=-lpng -luuid
-
-.PHONY: clean doc
-
-all: libguac.so
-
-doc:
-	doxygen
-
-clean-doc:
-	$(RM) -R doc
-
-libguac.so: client.o guacio.o protocol.o clientreg.o uuidtree.o
-	$(CC) -shared $(LDFLAGS) -Wl,-soname,libguac.so.0 -o libguac.so client.o protocol.o guacio.o clientreg.o uuidtree.o
-
-client.o: client.c include/client.h include/guacio.h
-	$(CC) $(CFLAGS) -c client.c
-
-clientreg.o: clientreg.c include/uuidtree.h include/client.h
-	$(CC) $(CFLAGS) -c clientreg.c
-
-uuidtree.o: uuidtree.c include/uuidtree.h
-	$(CC) $(CFLAGS) -c uuidtree.c
-
-protocol.o: protocol.c include/protocol.h include/guacio.h
-	$(CC) $(CFLAGS) -c protocol.c
-
-guacio.o: guacio.c include/guacio.h
-	$(CC) $(CFLAGS) -c guacio.c
-
-clean:
-	$(RM) *.o *.so
-
-distclean: clean
-	$(RM) *~
-
diff --git a/guacamole/libguac/Makefile.am b/guacamole/libguac/Makefile.am
new file mode 100644
index 000000000..1a9affa41
--- /dev/null
+++ b/guacamole/libguac/Makefile.am
@@ -0,0 +1,8 @@
+AUTOMAKE_OPTIONS = gnu
+lib_LTLIBRARIES = libguac.la
+
+libguac_la_SOURCES = client.c clientreg.c guacio.c protocol.c uuidtree.c
+include_HEADERS = include/client.h include/guacio.h include/protocol.h include/uuidtree.h
+
+libguac_la_LDFLAGS = -version-info 0:0:0
+
diff --git a/guacamole/libguac/NEWS b/guacamole/libguac/NEWS
new file mode 100644
index 000000000..e69de29bb
diff --git a/guacamole/libguac/README b/guacamole/libguac/README
new file mode 100644
index 000000000..e69de29bb
diff --git a/guacamole/libguac/configure.in b/guacamole/libguac/configure.in
new file mode 100644
index 000000000..4badf38ea
--- /dev/null
+++ b/guacamole/libguac/configure.in
@@ -0,0 +1,28 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_INIT(client.c)
+AM_INIT_AUTOMAKE(libguac, 0.0.1)
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_LIBTOOL
+
+# Checks for libraries.
+AC_CHECK_LIB([png], [png_write_png])
+AC_CHECK_LIB([uuid], [uuid_generate])
+
+# Checks for header files.
+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_CHECK_FUNCS([gettimeofday memmove memset select strdup])
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT