diff --git a/configure.ac b/configure.ac
index d0ba81e5..2af1de23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,8 +60,10 @@ AC_ARG_ENABLE([mu4e],
    AS_HELP_STRING([--disable-mu4e],[Disable building mu4e]))
 AS_IF([test "x$enable_mu4e" != "xno"], [
   AM_PATH_LISPDIR
-  AS_IF([test "x$lispdir" != "xno"],
-  	      [emacs_version="`$EMACS --version | head -1`"])
+  AS_IF([test "x$lispdir" != "xno"], [
+    emacs_version="`$EMACS --version | head -1`"
+    lispdir="${lispdir}/mu4e/"
+  ])
   AS_CASE([$emacs_version],[*23*|*24*|*25*],[build_mu4e=yes],
           [AC_WARN([emacs is too old to build mu4e (need emacs >= 23.x)])])
 ])
diff --git a/mu4e/Makefile.am b/mu4e/Makefile.am
index b82e4aea..4369b17a 100644
--- a/mu4e/Makefile.am
+++ b/mu4e/Makefile.am
@@ -21,8 +21,6 @@ SUBDIRS=
 info_TEXINFOS=mu4e.texi
 mu4e_TEXINFOS=fdl.texi
 
-lispdir=${prefix}/share/emacs/site-lisp/mu4e/
-
 dist_lisp_LISP=			\
 	mu4e-about.el		\
 	mu4e-actions.el		\