diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog
index a245161a56..e8bdbb7242 100644
--- a/vpn-daemons/vpnc/ChangeLog
+++ b/vpn-daemons/vpnc/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-17  David Zeuthen  <davidz@redhat.com>
+
+	* configure.in, Makefile.am: Various fixes such that 'make distcheck'
+	actually succeeds
+
 2005-06-17  David Zeuthen  <davidz@redhat.com>
 
 	* properties/nm-vpnc.c: Add new NM_VPN_API_SUBJECT_TO_CHANGE so we
diff --git a/vpn-daemons/vpnc/Makefile.am b/vpn-daemons/vpnc/Makefile.am
index bff59e0f26..40222a6f56 100644
--- a/vpn-daemons/vpnc/Makefile.am
+++ b/vpn-daemons/vpnc/Makefile.am
@@ -11,6 +11,12 @@ desktop_in_files = nm-vpnc.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-EXTRA_DIST = $(nmvpnservice_DATA) $(dbusservice_DATA) 
+EXTRA_DIST = $(nmvpnservice_DATA) \
+             $(dbusservice_DATA)  \
+             $(desktop_in_files)  \
+             intltool-extract.in  \
+             intltool-merge.in    \
+             intltool-update.in
 
-CLEANFILES = *~
+CLEANFILES = $(desktop_DATA) *~
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update
diff --git a/vpn-daemons/vpnc/configure.in b/vpn-daemons/vpnc/configure.in
index 6ef2474f84..5c622f48f7 100644
--- a/vpn-daemons/vpnc/configure.in
+++ b/vpn-daemons/vpnc/configure.in
@@ -34,11 +34,14 @@ AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MEMCMP
 AC_CHECK_FUNCS(select socket uname)
 
+ALL_LINGUAS="da"
+AC_SUBST(ALL_LINGUAS)
+
 GETTEXT_PACKAGE=NetworkManager-vpnc
-AC_PROG_INTLTOOL([0.27.2])
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
-ALL_LINGUAS="da"
+
+AC_PROG_INTLTOOL([0.27.2])
 AM_GLIB_GNU_GETTEXT
 
 PKG_CHECK_MODULES(GTHREAD, gthread-2.0)