diff --git a/configure b/configure
index 20ca5c17..ac8f789a 100755
--- a/configure
+++ b/configure
@@ -3912,6 +3912,8 @@ ac_config_files="$ac_config_files Makefile"
 
 ac_config_files="$ac_config_files znc-config"
 
+ac_config_files="$ac_config_files znc-buildmod"
+
 if test "$MODULES" = "yes"; then
 	ac_config_files="$ac_config_files modules/Makefile"
 
@@ -4485,6 +4487,7 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "znc-config") CONFIG_FILES="$CONFIG_FILES znc-config" ;;
+    "znc-buildmod") CONFIG_FILES="$CONFIG_FILES znc-buildmod" ;;
     "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff --git a/configure.in b/configure.in
index b6c2aa90..a75c5ba2 100644
--- a/configure.in
+++ b/configure.in
@@ -199,6 +199,7 @@ AC_SUBST([MODDIR])
 AC_SUBST([DATADIR])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([znc-config])
+AC_CONFIG_FILES([znc-buildmod])
 if test "$MODULES" = "yes"; then
 	AC_CONFIG_FILES([modules/Makefile])
 fi
diff --git a/znc-buildmod b/znc-buildmod
index f7fc5fef..f226f8b2 100755
--- a/znc-buildmod
+++ b/znc-buildmod
@@ -22,6 +22,13 @@ OK="${BOLD}${BLUE}[${GREEN} ok ${BLUE}]${NORMAL}${UNBOLD}"
 
 PROGRESS="${BOLD}${BLUE}[    ]${NORMAL}${UNBOLD}"
 
+# Update $PATH so that we will also find the znc binary if we were compiled
+# with  ./configure --prefix=/some/path
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+bindir="@bindir@"
+PATH="$PATH:$bindir"
+
 # Check if we got everything we need
 
 SED=sed
diff --git a/znc-config.in b/znc-config.in
index 272b5ff7..d04b079e 100755
--- a/znc-config.in
+++ b/znc-config.in
@@ -2,8 +2,9 @@
 
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
-datadir="@datadir@"
 datarootdir="@datarootdir@"
+bindir="@bindir@"
+datadir="@datadir@"
 
 CXXFLAGS="@MODFLAGS@"
 INCLUDES="-I@prefix@/include/znc @INCLUDES@"