diff --git a/Makefile.in b/Makefile.in
index e99cb5b1..ef3f77a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,3 +1,12 @@
+prefix      := @prefix@
+exec_prefix := @exec_prefix@
+datarootdir := @datarootdir@
+bindir      := @bindir@
+datadir     := @datadir@
+sysconfdir  := @sysconfdir@
+libdir      := @libdir@
+sbindir     := @sbindir@
+localstatedir := @localstatedir@
 CXX      := @CXX@
 CXXFLAGS := @CXXFLAGS@
 LDFLAGS  := @LDFLAGS@
diff --git a/configure.in b/configure.in
index 6e858928..f0835890 100644
--- a/configure.in
+++ b/configure.in
@@ -130,7 +130,13 @@ fi
 AC_ARG_WITH( [module-prefix],
 	AC_HELP_STRING([--with-module-prefix=/path/to/moduledir], []),
 	[MODDIR=$withval],
-	[MODDIR="${prefix}/libexec/znc"] )
+	[MODDIR="${libdir}/znc"] )
+
+AC_ARG_WITH( [module-data-prefix],
+	AC_HELP_STRING([--with-module-data-prefix=/path/to/moduledir], []),
+	[DATADIR=$withval],
+	[DATADIR="${datadir}/znc"] )
+
 
 if test "$MODULES" = "yes"; then
 	if test -z "$NOCHECK_DL"; then
@@ -155,6 +161,7 @@ if test "$MODULES" = "yes"; then
 		fi
 
 		appendCXX "-D_MODDIR_=\\\"${MODDIR}\\\""
+		appendCXX "-D_DATADIR_=\\\"${DATADIR}\\\""
 
 		if test -z "$NOPERL"; then
 			echo -n "checking for perl... "
@@ -195,6 +202,7 @@ AC_SUBST([NOSSL])
 AC_SUBST([PERL])
 AC_SUBST([SASL])
 AC_SUBST([MODDIR])
+AC_SUBST([DATADIR])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([znc-config])
 if test "$MODULES" = "yes"; then
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 52a0da8d..cf10ebcc 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -1,3 +1,12 @@
+prefix      := @prefix@
+exec_prefix := @exec_prefix@
+datarootdir := @datarootdir@
+bindir      := @bindir@
+datadir     := @datadir@
+sysconfdir  := @sysconfdir@
+libdir      := @libdir@
+sbindir     := @sbindir@
+localstatedir := @localstatedir@
 CXX      := @CXX@
 CXXFLAGS := @CXXFLAGS@
 LDFLAGS  := @LDFLAGS@
@@ -5,7 +14,7 @@ INCLUDES := @INCLUDES@ -I..
 LIBS     := @LIBS@
 PERL     := @PERL@
 MODDIR   := @MODDIR@
-prefix   := @prefix@
+DATADIR  := @DATADIR@
 
 ifeq "@NOSSL@" "1" 
 FILES    := $(foreach file, $(wildcard *.cpp), \
@@ -50,12 +59,13 @@ install: all create_install_dir install_metadirs $(PERLHOOK)
 
 create_install_dir:
 	mkdir -p $(DESTDIR)$(MODDIR)
+	mkdir -p $(DESTDIR)$(DATADIR)
 	rm -rf $(DESTDIR)$(MODDIR)/*.so
 
 install_metadirs: create_install_dir
 	for a in *; do \
 		if [ -d $$a ] && [ -f $${a}.so ]; then \
-			cp -Rp $$a $(DESTDIR)$(MODDIR); \
+			cp -Rp $$a $(DESTDIR)$(DATADIR); \
 		fi \
 	done
 
diff --git a/znc-config.in b/znc-config.in
index e2950c61..97e697d3 100644
--- a/znc-config.in
+++ b/znc-config.in
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+datadir="@datadir@"
+datarootdir="@datarootdir@"
+
 CXXFLAGS="@CXXFLAGS@"
 INCLUDES="-I@prefix@/include/znc @INCLUDES@"
 LIBS="@LIBS@"