diff --git a/configure b/configure
index 15197807e..e6ab4a344 100755
--- a/configure
+++ b/configure
@@ -1309,7 +1309,7 @@ Optional Features:
   --enable-all            same as --enable-nif --enable-mysql --enable-pgsql
                           --enable-pam --enable-zlib --enable-stun
                           --enable-riak --enable-json --enable-iconv
-                          --enable-debug --enable-pubsub_ng --enable-http
+                          --enable-debug --enable-pubsub-ng --enable-http
                           (useful for Dialyzer checks, default: no)
   --enable-nif            replace some functions with C equivalents. Requires
                           Erlang R13B04 or higher (default: no)
@@ -1323,7 +1323,7 @@ Optional Features:
   --enable-json           enable JSON support for mod_bosh (default: no)
   --enable-iconv          enable iconv support (default: yes)
   --enable-debug          enable debug information (default: yes)
-  --enable-pubsub_ng      enable PubSub NG (default: no)
+  --enable-pubsub-ng      enable PubSub NG (default: no)
   --enable-http           build external HTTP libraries ('ibrowse' and
                           'lhttpc', default: no)
   --enable-user[[[=USER]]]
@@ -2616,7 +2616,7 @@ if test "${enable_pubsub_ng+set}" = set; then :
   enableval=$enable_pubsub_ng; case "${enableval}" in
   yes) pubsub_ng=true ;;
   no)  pubsub_ng=false ;;
-  *) as_fn_error $? "bad value ${enableval} for --enable-pubsub_ng" "$LINENO" 5  ;;
+  *) as_fn_error $? "bad value ${enableval} for --enable-pubsub-ng" "$LINENO" 5  ;;
 esac
 else
   if test "x$pubsub_ng" = "x"; then pubsub_ng=false; fi
diff --git a/configure.ac b/configure.ac
index 441ee7cc3..1b016ea27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,7 +99,7 @@ AC_ARG_ENABLE(tools,
 esac],[tools=false])
 
 AC_ARG_ENABLE(all,
-[AC_HELP_STRING([--enable-all], [same as --enable-nif --enable-mysql --enable-pgsql --enable-pam --enable-zlib --enable-stun --enable-riak --enable-json --enable-iconv --enable-debug --enable-pubsub_ng --enable-http (useful for Dialyzer checks, default: no)])],
+[AC_HELP_STRING([--enable-all], [same as --enable-nif --enable-mysql --enable-pgsql --enable-pam --enable-zlib --enable-stun --enable-riak --enable-json --enable-iconv --enable-debug --enable-pubsub-ng --enable-http (useful for Dialyzer checks, default: no)])],
 [case "${enableval}" in
   yes) nif=true mysql=true pgsql=true pam=true zlib=true stun=true riak=true json=true iconv=true debug=true pubsub_ng=true http=true ;;
   no) nif=false mysql=false pgsql=false pam=false zlib=false stun=false riak=false json=false iconv=false debug=false pubsub_ng=false http=false ;;
@@ -187,11 +187,11 @@ AC_ARG_ENABLE(debug,
 esac],[if test "x$debug" = "x"; then debug=true; fi])
 
 AC_ARG_ENABLE(pubsub_ng,
-[AC_HELP_STRING([--enable-pubsub_ng], [enable PubSub NG (default: no)])],
+[AC_HELP_STRING([--enable-pubsub-ng], [enable PubSub NG (default: no)])],
 [case "${enableval}" in
   yes) pubsub_ng=true ;;
   no)  pubsub_ng=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-pubsub_ng) ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-pubsub-ng) ;;
 esac],[if test "x$pubsub_ng" = "x"; then pubsub_ng=false; fi])
 
 AC_ARG_ENABLE(http,