diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog
index 24a43c1155..e2a02f3b0c 100644
--- a/vpn-daemons/openvpn/ChangeLog
+++ b/vpn-daemons/openvpn/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-26  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Andreas Hanke <andreas.hanke@gmx-topmail.de>
+
+	* configure.in
+	  acinclude.m4
+	  Makefile.am
+		- remove broken usage of AS_AC_EXPAND (#413323)
+
 2007-07-26  Dan Williams  <dcbw@redhat.com>
 
     Patch from Robert Buchholz <rbu@gentoo.org>
diff --git a/vpn-daemons/openvpn/Makefile.am b/vpn-daemons/openvpn/Makefile.am
index 08c0ce761f..71fd39e2eb 100644
--- a/vpn-daemons/openvpn/Makefile.am
+++ b/vpn-daemons/openvpn/Makefile.am
@@ -22,7 +22,14 @@ icondir = $(datadir)/icons/hicolor/48x48/apps
 icon_DATA = gnome-mime-application-x-openvpn-settings.png
 endif
 
-EXTRA_DIST = $(nmvpnservice_DATA) \
+nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in Makefile
+	sed	-e 's|[@]BINDIR[@]|$(bindir)|g' \
+		-e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
+		-e 's|[@]LIBDIR[@]|$(libdir)|g' \
+		< $(srcdir)/nm-openvpn-service.name.in \
+		> nm-openvpn-service.name
+
+EXTRA_DIST = nm-openvpn-service.name.in \
              $(dbusservice_DATA)  \
              $(desktop_in_files)  \
              $(icon_DATA)         \
@@ -30,5 +37,5 @@ EXTRA_DIST = $(nmvpnservice_DATA) \
              intltool-merge.in    \
              intltool-update.in
 
-CLEANFILES = $(desktop_DATA) *~
+CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
diff --git a/vpn-daemons/openvpn/acinclude.m4 b/vpn-daemons/openvpn/acinclude.m4
deleted file mode 100644
index 571b4fc57f..0000000000
--- a/vpn-daemons/openvpn/acinclude.m4
+++ /dev/null
@@ -1,45 +0,0 @@
-
-dnl as-ac-expand.m4 0.1.0
-dnl autostars m4 macro for expanding directories using configure's prefix
-dnl thomas@apestaart.org 
-
-dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-dnl
-dnl example
-dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
-
-AC_DEFUN(AS_AC_EXPAND,
-[
-  EXP_VAR=[$1]
-  FROM_VAR=[$2]
-
-  dnl first expand prefix and exec_prefix if necessary
-  prefix_save=$prefix
-  exec_prefix_save=$exec_prefix
-
-  dnl if no prefix given, then use /usr/local, the default prefix
-  if test "x$prefix" = "xNONE"; then
-    prefix=$ac_default_prefix
-  fi
-  dnl if no exec_prefix given, then use prefix
-  if test "x$exec_prefix" = "xNONE"; then
-    exec_prefix=$prefix
-  fi
-
-  full_var="$FROM_VAR"
-  dnl loop until it doesn't change anymore
-  while true; do
-    new_full_var="`eval echo $full_var`"
-    if test "x$new_full_var"="x$full_var"; then break; fi
-    full_var=$new_full_var
-  done
-
-  dnl clean up
-  full_var=$new_full_var
-  AC_SUBST([$1], "$full_var")
-
-  dnl restore prefix and exec_prefix
-  prefix=$prefix_save
-  exec_prefix=$exec_prefix_save
-])
diff --git a/vpn-daemons/openvpn/configure.in b/vpn-daemons/openvpn/configure.in
index 22016343eb..a7961bbff7 100644
--- a/vpn-daemons/openvpn/configure.in
+++ b/vpn-daemons/openvpn/configure.in
@@ -86,14 +86,6 @@ if test x"$with_gnome" != xno; then
 	AC_SUBST(GNOMEKEYRING_LIBS)
 fi
 
-AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
-AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-AS_AC_EXPAND(DATADIR, $datadir)
-AS_AC_EXPAND(BINDIR, $bindir)
-AS_AC_EXPAND(SBINDIR, $sbindir)
-AS_AC_EXPAND(LIBDIR, $libdir)
-AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
-
 AC_ARG_ENABLE(more-warnings,
 AC_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]),
 set_more_warnings="$enableval",[
@@ -133,5 +125,4 @@ src/Makefile
 auth-dialog/Makefile
 properties/Makefile
 po/Makefile.in
-nm-openvpn-service.name
 ])