diff --git a/autogen.sh b/autogen.sh
index 0d62db3b..a25ac0e4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,8 +4,6 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="seahorse"
-
 (test -f $srcdir/configure.ac) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level directory"
@@ -17,4 +15,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.9 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index d4ee3dc2..fa48e5a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AVAHI_GLIB_REQUIRED=0.6
 # Basic tools
 
 AC_CONFIG_AUX_DIR([build/aux])
-AM_INIT_AUTOMAKE([1.11 tar-ustar foreign -Wno-portability])
+AM_INIT_AUTOMAKE([1.11 tar-ustar foreign -Wno-portability subdir-objects])
 AM_SANITY_CHECK
 AC_CONFIG_HEADERS([build/config.h])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -121,17 +121,17 @@ AC_CHECK_FUNCS(strsep)
 
 AC_ARG_ENABLE(pgp,
 	AC_HELP_STRING([--enable-pgp], [enable PGP support (default is auto)]))
-	
+
 have_gpg=""
 have_gpgme=""
 
 if test "$enable_pgp" = "no"; then
 	echo "disabling PGP support"
 else
-	AC_ARG_ENABLE(gpg-check, 
+	AC_ARG_ENABLE(gpg-check,
 		AC_HELP_STRING([--disable-gpg-check], [check GPG version (default is yes)]),
 		DO_CHECK=$enableval, DO_CHECK=yes)
-	
+
 	if test	"$DO_CHECK" = "yes"; then
 		AC_PATH_PROGS(GNUPG, [gpg2 gpg], no)
 		AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
@@ -145,7 +145,7 @@ else
 				sed 's/^gpg (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
 			micro=`echo $gnupg_version | \
 				sed 's/^gpg (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
-    
+
 			for ver in $GNUPG_ACCEPTED; do
 				branch=`echo $ver | sed 's/\.[[0-9]]*$//'`
 				if test "$branch" = "$major.$minor"; then
@@ -160,7 +160,7 @@ else
 				fi
 			done
 		fi
-  
+
 		if test "$ok" = "yes"; then
 			AC_MSG_RESULT([yes])
 			have_gpg="$gnupg_version"
@@ -215,7 +215,7 @@ if test "$enable_pgp" = "yes"; then
 	if test -z "$have_gpg"; then
 		AC_MSG_ERROR([Appropriate version of GnuPG not found. Please install one of the following versions (or later): $GNUPG_ACCEPTED])
 	fi
-			
+
 	if test -z "$have_gpgme"; then
 		AC_MSG_ERROR(GPGME $GPGME_REQUIRED or later needed)
 	fi
@@ -252,7 +252,7 @@ AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname,
 	[NETLIBS="-lnsl $NETLIBS"]))
 AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt,
 	[NETLIBS="-lsocket $NETLIBS"]))
-	
+
 dnl Try and link a LDAP test program to weed out unusable LDAP
 dnl libraries.  -lldap [-llber [-lresolv]] is for OpenLDAP.  OpenLDAP in
 dnl general is terrible with creating weird dependencies.  If all else
@@ -288,14 +288,14 @@ if test "$try_ldap" = yes ; then
 
     LIBS=$_ldap_save_libs
 
-    if test "$LDAP_LIBS" != ""; then 
+    if test "$LDAP_LIBS" != ""; then
     	with_keyserver=yes
         with_ldap=yes
 		AC_DEFINE(WITH_LDAP, 1, [Support for LDAP operations])
     	break
     fi
   done
-fi	
+fi
 
 AM_CONDITIONAL(WITH_LDAP, test "$with_ldap" = "yes")
 SEAHORSE_LIBS="$SEAHORSE_LIBS $LDAP_LIBS"
@@ -305,7 +305,7 @@ AC_SUBST(NETLIBS)
 # -----------------------------------------------------------------------------
 # HKP (libsoup)
 
-# Allow hkp to be disabled 
+# Allow hkp to be disabled
 AC_ARG_ENABLE(hkp,
         AC_HELP_STRING([--disable-hkp],
         [disable HKP keyserver interface]))
@@ -315,24 +315,24 @@ if test "$enable_pgp" != "yes"; then
 	echo "HKP keyserver interface requires PGP support"
 	enable_hkp=no
 fi
- 
+
 if test "$enable_hkp" = "no"; then
     echo "disabling HKP keyserver interface"
 else
-    
+
     echo "checking for supported versions of libsoup..."
 
     PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.33.92,
-        [enable_hkp=yes],  
+        [enable_hkp=yes],
         [enable_hkp=no])
 
     if test "$enable_hkp" = yes; then
         with_keyserver=yes
-        
+
         AC_DEFINE(WITH_HKP, 1, [Support for HKP operations])
         SEAHORSE_LIBS="$SEAHORSE_LIBS $SOUP_LIBS"
         SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $SOUP_CFLAGS"
-        
+
         # libsoup is also used for async lookups
         AC_DEFINE(WITH_SOUP, 1, [With libsoup])
     fi
@@ -370,7 +370,7 @@ SEAHORSE_LIBS="$SEAHORSE_LIBS $LIBSECRET_LIBS"
 # KEY SHARING
 
 # Allow sharing to be disabled
-AC_ARG_ENABLE(sharing, 
+AC_ARG_ENABLE(sharing,
         AC_HELP_STRING([--disable-sharing],
         [Don't compile in DNS-SD key sharing]))
 
@@ -378,7 +378,7 @@ if test "$enable_pgp" != "yes"; then
 	echo "DNS-SD key sharing requires PGP support"
 	enable_sharing=no
 fi
-	
+
 if test "$enable_hkp" = "no"; then
     	echo "DNS-SD key sharing requires HKP support"
 	enable_sharing=no
@@ -388,13 +388,13 @@ if test "$enable_sharing" = "no"; then
     echo "disabling DNS-SD key sharing"
 else
 
-    PKG_CHECK_MODULES(SHARING, avahi-client avahi-glib >= $AVAHI_GLIB_REQUIRED, 
-        [enable_sharing=yes],  
+    PKG_CHECK_MODULES(SHARING, avahi-client avahi-glib >= $AVAHI_GLIB_REQUIRED,
+        [enable_sharing=yes],
         [enable_sharing=no])
-		
+
 	if test "$enable_sharing" = "yes"; then
 		echo "enabling key sharing"
-		
+
 		AC_DEFINE_UNQUOTED(WITH_SHARING, 1, [Compile bonjour key sharing code])
 		SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $SHARING_CFLAGS"
 		SEAHORSE_LIBS="$SEAHORSE_LIBS $SHARING_LIBS"
@@ -430,24 +430,24 @@ AM_CONDITIONAL(WITH_PKCS11, test "$enable_pkcs11" = "yes")
 #  SSH
 
 AC_ARG_ENABLE(ssh,
-        AC_HELP_STRING([--disable-ssh], 
+        AC_HELP_STRING([--disable-ssh],
         [Support for managing SSH keys]))
-        
+
 if test "x$enable_ssh" = "xno"; then
     echo "disabling ssh support"
 else
 
     AC_PATH_PROG(SSH_KEYGEN_PATH, ssh-keygen, "failed")
     AC_PATH_PROG(SSH_PATH, ssh, "failed")
-    
-    if test $SSH_KEYGEN_PATH != "failed" && 
+
+    if test $SSH_KEYGEN_PATH != "failed" &&
        test $SSH_PATH != "failed"; then
         enable_ssh="yes"
         AC_DEFINE(WITH_SSH, 1, [With SSH Support])
         AC_DEFINE_UNQUOTED(SSH_KEYGEN_PATH, "$SSH_KEYGEN_PATH", [Path to ssh-keygen])
         AC_DEFINE_UNQUOTED(SSH_PATH, "$SSH_PATH", [Path to ssh])
     fi
-    
+
 fi
 
 AM_CONDITIONAL(WITH_SSH, test "$enable_ssh" = "yes")
