diff --git a/configure b/configure
index f3e75b4c..b46acd18 100755
--- a/configure
+++ b/configure
@@ -3626,7 +3626,7 @@ fi
 if test "${with_module_prefix+set}" = set; then
   withval=$with_module_prefix; MODDIR=$withval
 else
-  MODDIR="${prefix}/libexec"
+  MODDIR="${prefix}/libexec/znc"
 fi
 
 
@@ -3726,7 +3726,7 @@ fi
 			MODFLAGS="$MODFLAGS -mimpure-text"
 		fi
 
-		appendCXX "-D_MODDIR_=\\\"${MODDIR}/znc\\\""
+		appendCXX "-D_MODDIR_=\\\"${MODDIR}\\\""
 
 		if test -z "$NOPERL"; then
 			echo -n "checking for perl... "
diff --git a/configure.in b/configure.in
index 0e64ccd9..1c2190b2 100644
--- a/configure.in
+++ b/configure.in
@@ -127,7 +127,7 @@ fi
 AC_ARG_WITH( [module-prefix],
 	AC_HELP_STRING([--with-module-prefix=/path/to/moduledir], []),
 	[MODDIR=$withval],
-	[MODDIR="${prefix}/libexec"] )
+	[MODDIR="${prefix}/libexec/znc"] )
 
 if test "$MODULES" = "yes"; then
 	if test -z "$NOCHECK_DL"; then
@@ -151,7 +151,7 @@ if test "$MODULES" = "yes"; then
 			MODFLAGS="$MODFLAGS -mimpure-text"
 		fi
 
-		appendCXX "-D_MODDIR_=\\\"${MODDIR}/znc\\\""
+		appendCXX "-D_MODDIR_=\\\"${MODDIR}\\\""
 
 		if test -z "$NOPERL"; then
 			echo -n "checking for perl... "
diff --git a/modules/Makefile.in b/modules/Makefile.in
index b3d9aa73..24fc6d12 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -42,16 +42,16 @@ all: $(OBJS) $(TARGETS)
 depend: .depend
 
 install: all create_install_dir install_metadirs $(PERLHOOK)
-	install -m 0755 $(TARGETS) $(DESTDIR)$(MODDIR)/znc
+	install -m 0755 $(TARGETS) $(DESTDIR)$(MODDIR)
 
 create_install_dir:
-	mkdir -p $(DESTDIR)$(MODDIR)/znc
-	rm -rf $(DESTDIR)$(MODDIR)/znc/*.so
+	mkdir -p $(DESTDIR)$(MODDIR)
+	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)/znc; \
+			cp -Rp $$a $(DESTDIR)$(MODDIR); \
 		fi \
 	done
 
@@ -73,7 +73,7 @@ modperl.o: modperl.cpp
 
 modperl_install: create_install_dir
 	for i in *.pm; do \
-		install -m 0755 $$i $(DESTDIR)$(MODDIR)/znc; \
+		install -m 0755 $$i $(DESTDIR)$(MODDIR); \
 	done
 else
 modperl.so:
diff --git a/znc-config.in b/znc-config.in
index 5ff7c869..e2950c61 100644
--- a/znc-config.in
+++ b/znc-config.in
@@ -3,13 +3,15 @@
 CXXFLAGS="@CXXFLAGS@"
 INCLUDES="-I@prefix@/include/znc @INCLUDES@"
 LIBS="@LIBS@"
+MODDIR="@MODDIR@"
 VERSION="@VERSION@"
 
 if test -z "$1"; then
-	echo "USAGE: $0 <--cflags|--include|--libs|--version>"
+	echo "USAGE: $0 <--cflags|--include|--libs|--moddir|--version|--prefix>"
 	echo "	--cflags     [$CXXFLAGS]"
 	echo "	--include    [$INCLUDES]"
 	echo "	--libs       [$LIBS]"
+	echo "	--moddir     [$MODDIR]"
 	echo "	--version    [$VERSION]"
 	echo "	--prefix     [@prefix@]"
 	exit 1
@@ -22,6 +24,8 @@ case $1 in
 		echo $INCLUDES;;
 	--libs)
 		echo $LIBS;;
+	--moddir)
+		echo $MODDIR;;
 	--version)
 		echo $VERSION;;
 	--prefix)