diff --git a/configure.ac b/configure.ac
line changes: +4/-3
index df111b8..2cce3b9
--- a/configure.ac
+++ b/configure.ac

@@ -3,14 +3,15 @@
 
 AC_PREREQ([2.68])
 AC_INIT([libsimplepgp], [1.0], [trevor@trevorbentley.com])
-AM_INIT_AUTOMAKE([libsimplepgp], [1.0])
 
-AC_COPYRIGHT(Apache License V2.0)
+AC_COPYRIGHT(Trevor Bentley 2011)
 
-AC_CONFIG_SRCDIR([gcrypt-module.h])
+AC_CONFIG_SRCDIR([src/packet.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile])
 
+AM_INIT_AUTOMAKE([subdir-objects foreign])
+
 AC_PROG_LIBTOOL
 
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/src/Makefile.am b/src/Makefile.am
line changes: +0/-15
index dacbb3d..0000000
--- a/src/Makefile.am
+++ /dev/null

@@ -1,15 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-
-CFLAGS=-Wall -O2 `libgcrypt-config --cflags` `gpg-error-config --cflags` -I/usr/include -I/usr/local/include
-LDFLAGS=`libgcrypt-config --libs` `gpg-error-config --libs`
-
-pkglib_LTLIBRARIES = libsimplepgp.la
-pkginclude_HEADERS = packet.h
-
-libsimplepgp_la_SOURCES = \
-	packet.c \
-	keychain.c \
-	util.c \
-	mpi.c 
-
-