diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 00000000..77152233
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,198 @@
+pkgconfigdir=$(libdir)/pkgconfig
+libincludedir=$(includedir)/libburn
+
+lib_LTLIBRARIES = libburn/libburn.la 
+
+## ========================================================================= ##
+
+# Build libraries
+libburn_libburn_la_LDFLAGS = \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libburn_libburn_la_LIBADD = $(LIBBURN_ARCH_LIBS) $(THREAD_LIBS)
+libburn_libburn_la_SOURCES = \
+	libburn/async.c \
+	libburn/async.h \
+	libburn/back_hacks.h \
+	libburn/cleanup.c \
+	libburn/cleanup.h \
+	libburn/crc.c \
+	libburn/crc.h \
+	libburn/debug.c \
+	libburn/debug.h \
+	libburn/drive.c \
+	libburn/drive.h \
+	libburn/error.h \
+	libburn/file.c \
+	libburn/file.h \
+	libburn/init.c \
+	libburn/init.h \
+	libburn/lec.c \
+	libburn/lec.h \
+	libburn/libburn.h \
+	libburn/libdax_audioxtr.h \
+	libburn/libdax_audioxtr.c \
+	libburn/libdax_msgs.h \
+	libburn/libdax_msgs.c \
+	libburn/mmc.c \
+	libburn/mmc.h \
+	libburn/null.c \
+	libburn/null.h \
+	libburn/options.c \
+	libburn/options.h \
+	libburn/os.h \
+	libburn/read.c \
+	libburn/read.h \
+	libburn/sbc.c \
+	libburn/sbc.h \
+	libburn/sector.c \
+	libburn/sector.h \
+	libburn/sg.c \
+	libburn/sg.h \
+	libburn/source.h \
+	libburn/source.c \
+	libburn/spc.c \
+	libburn/spc.h \
+	libburn/structure.c \
+	libburn/structure.h \
+	libburn/toc.c \
+	libburn/toc.h \
+	libburn/transport.h \
+	libburn/util.c \
+	libburn/util.h \
+	libburn/write.c \
+	libburn/write.h \
+	version.h
+
+##	libburn/sg-@ARCH@.c \
+
+libinclude_HEADERS = \
+	libburn/libburn.h 
+
+## ========================================================================= ##
+
+## Build test applications
+noinst_PROGRAMS = \
+	test/libburner \
+	test/telltoc \
+	test/dewav \
+	test/fake_au \
+	test/poll \
+	test/structest
+
+bin_PROGRAMS = \
+	cdrskin/cdrskin
+
+test_libburner_CPPFLAGS = -Ilibburn
+test_libburner_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
+test_libburner_SOURCES = test/libburner.c
+test_telltoc_CPPFLAGS = -Ilibburn
+test_telltoc_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
+test_telltoc_SOURCES = test/telltoc.c
+test_dewav_CPPFLAGS = -Ilibburn
+test_dewav_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
+test_dewav_SOURCES = test/dewav.c
+test_fake_au_CPPFLAGS = 
+test_fake_au_LDADD =
+test_fake_au_SOURCES = test/fake_au.c
+test_poll_CPPFLAGS = -Ilibburn
+test_poll_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
+test_poll_SOURCES = test/poll.c
+test_structest_CPPFLAGS = -Ilibburn
+test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
+test_structest_SOURCES = test/structest.c
+
+##  cdrskin construction site - ts A60816 - A70720
+cdrskin_cdrskin_CPPFLAGS = -Ilibburn
+cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_3_9
+cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
+cdrskin_cdrskin_SOURCES = cdrskin/cdrskin.c cdrskin/cdrfifo.c cdrskin/cdrfifo.h cdrskin/cdrskin_timestamp.h
+##
+## Open questions: how to compute $timestamp and express -DX="$timestamp"
+##                 
+
+
+
+## ========================================================================= ##
+
+## Build documentation (You need Doxygen for this to work)
+webhost = http://libburn-api.pykix.org
+webpath = /
+docdir = $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+
+doc:	doc/html
+
+doc/html: doc/doxygen.conf
+	if [ -f ./doc/doc.lock ]; then \
+		$(RM) -r doc/html; \
+		doxygen doc/doxygen.conf; \
+	fi
+
+doc-upload: doc/html
+	scp -r $</* $(webhost):$(webpath)
+
+all: doc
+
+install-data-local: 
+	if [ -f ./doc/doc.lock ]; then \
+		$(mkinstalldirs) $(docdir)/html; \
+		$(INSTALL_DATA) doc/html/* $(docdir)/html; \
+	fi
+
+uninstall-local:
+	rm -rf $(docdir)
+
+## ========================================================================= ##
+
+# Indent source files
+indent_files = \
+	$(libburn_libburn_la_SOURCES) \
+	$(test_poll_SOURCES) \
+	$(test_structest_SOURCES)
+	
+
+indent: $(indent_files)
+	indent -bad -bap -nbbb -nbbo -nbc -bli0 -br -bls   \
+		-cdw -ce -cli0 -ncs -nbfda -i8 -l79 -lc79   \
+		-lp -saf -sai -nprs -npsl -saw -sob -ss -ut \
+		-sbi0 -nsc -ts8 -npcs -ncdb -fca            \
+		$^
+
+.PHONY: indent
+
+## ========================================================================= ##
+
+# Extra things
+nodist_pkgconfig_DATA = \
+	libburn-5.pc
+
+# http://www.nada.kth.se/cgi-bin/info?(automake.info)Man%20pages
+man_MANS = cdrskin/cdrskin.1
+
+EXTRA_DIST = \
+	libburn-5.pc.in \
+	version.h.in \
+	doc/comments \
+	doc/doxygen.conf.in \
+	README \
+	AUTHORS \
+	CONTRIBUTORS \
+	COPYRIGHT \
+	cdrskin/README \
+	cdrskin/cdrecord_spy.sh \
+	cdrskin/compile_cdrskin.sh \
+	cdrskin/convert_man_to_html.sh \
+	cdrskin/changelog.txt \
+	cdrskin/cdrskin_eng.html \
+	cdrskin/wiki_plain.txt \
+	cdrskin/cleanup.h \
+	cdrskin/cleanup.c \
+	libburn/os-freebsd.h \
+	libburn/os-linux.h \
+	libburn/sg-freebsd.c \
+	libburn/sg-linux.c \
+	COPYING \
+	NEWS \
+	ChangeLog \
+	INSTALL \
+	$(man_MANS)
+
diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 00000000..861847bb
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,22 @@
+AC_DEFUN([TARGET_SHIZZLE],
+[
+  ARCH=""
+
+  AC_MSG_CHECKING([target operating system])
+
+  case $target in
+    *-*-linux*)
+      ARCH=linux
+      LIBBURN_ARCH_LIBS=
+      ;;
+    *-*-freebsd*)
+      ARCH=freebsd
+      LIBBURN_ARCH_LIBS=-lcam
+      ;;
+    *)
+      AC_ERROR([You are attempting to compile for an unsupported platform])
+      ;;
+  esac
+
+  AC_MSG_RESULT([$ARCH])
+])
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 00000000..f10626f5
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,105 @@
+AC_INIT([libburn], [0.3.9], [http://libburnia-project.org])
+AC_PREREQ([2.50])
+dnl AC_CONFIG_HEADER([config.h])	
+
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
+AM_INIT_AUTOMAKE([subdir-objects])
+
+dnl Making releases:
+dnl   BURN_MICRO_VERSION += 1;
+dnl   BURN_INTERFACE_AGE += 1;
+dnl   BURN_BINARY_AGE += 1;
+dnl if any functions have been added, set BURN_INTERFACE_AGE to 0.
+dnl if backwards compatibility has been broken,
+dnl set BURN_BINARY_AGE and BURN_INTERFACE_AGE to 0.
+dnl
+dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match
+dnl
+BURN_MAJOR_VERSION=0
+BURN_MINOR_VERSION=3
+BURN_MICRO_VERSION=9
+BURN_INTERFACE_AGE=0
+BURN_BINARY_AGE=0
+BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
+
+AC_SUBST(BURN_MAJOR_VERSION)
+AC_SUBST(BURN_MINOR_VERSION)
+AC_SUBST(BURN_MICRO_VERSION)
+AC_SUBST(BURN_INTERFACE_AGE)
+AC_SUBST(BURN_BINARY_AGE)
+AC_SUBST(BURN_VERSION)
+
+dnl Libtool versioning
+LT_RELEASE=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION
+LT_CURRENT=`expr $BURN_MICRO_VERSION - $BURN_INTERFACE_AGE`
+LT_REVISION=$BURN_INTERFACE_AGE
+LT_AGE=`expr $BURN_BINARY_AGE - $BURN_INTERFACE_AGE`
+LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
+
+AC_SUBST(LT_RELEASE)
+AC_SUBST(LT_CURRENT)
+AC_SUBST(LT_REVISION)
+AC_SUBST(LT_AGE)
+AC_SUBST(LT_CURRENT_MINUS_AGE)
+
+AC_PREFIX_DEFAULT([/usr/local])
+test "$prefix" = "NONE" && prefix=$ac_default_prefix
+
+AM_MAINTAINER_MODE
+
+AM_PROG_CC_C_O
+AC_C_CONST
+AC_C_INLINE
+AC_C_BIGENDIAN
+
+dnl Large file support
+AC_SYS_LARGEFILE
+AC_FUNC_FSEEKO
+AC_CHECK_FUNC([fseeko])
+if test ! $ac_cv_func_fseeko; then
+   AC_ERROR([Libburn requires largefile support.])
+fi
+
+AC_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
+LIBTOOL="$LIBTOOL --silent"
+
+AC_PROG_INSTALL
+
+AC_CHECK_HEADERS()
+
+THREAD_LIBS=-lpthread
+AC_SUBST(THREAD_LIBS)
+
+TARGET_SHIZZLE
+AC_SUBST(ARCH)
+AC_SUBST(LIBBURN_ARCH_LIBS)
+
+dnl Add compiler-specific flags
+
+dnl See if the user wants aggressive optimizations of the code
+AC_ARG_ENABLE(debug,
+[  --enable-debug          Disable aggressive optimizations [default=yes]],
+              , enable_debug=yes)
+if test x$enable_debug != xyes; then
+    if test x$GCC = xyes; then
+        CFLAGS="$CFLAGS -O3"
+        CFLAGS="$CFLAGS -fexpensive-optimizations"
+    fi
+    CFLAGS="$CFLAGS -DNDEBUG"
+else
+    if test x$GCC = xyes; then
+        CFLAGS="$CFLAGS -g -pedantic -Wall"
+    fi
+    CFLAGS="$CFLAGS -DDEBUG"
+fi
+
+AC_CONFIG_FILES([
+	Makefile
+	doc/doxygen.conf
+	version.h
+	libburn-5.pc
+	])
+AC_OUTPUT
diff --git a/version.h.in b/version.h.in
new file mode 100644
index 00000000..13ada991
--- /dev/null
+++ b/version.h.in
@@ -0,0 +1,3 @@
+#define BURN_MAJOR_VERSION @BURN_MAJOR_VERSION@
+#define BURN_MINOR_VERSION @BURN_MINOR_VERSION@
+#define BURN_MICRO_VERSION @BURN_MICRO_VERSION@