diff --git a/configure.in b/configure.in
index aa66983..55938ca 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_PREREQ(2.53)
 AC_INIT([ghex], [2.24.0],
 	[http://bugzilla.gnome.org/enter_bug.cgi?product=ghex])
 AC_CONFIG_SRCDIR(src/ghex-window.c)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign])
 AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE
diff --git a/src/Makefile.am b/src/Makefile.am
index c22cd31..661056f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,8 +62,8 @@ EXTRA_DIST = \
 	ghex-marshal.list
 
 LDADD =	\
+	libgtkhex.la \
 	$(POPT_LIBS)	\
-	$(GHEX_LIBS)	\
-	libgtkhex.la
+	$(GHEX_LIBS)
 
 CLEAN_FILES = $(BUILT_SOURCES)
