diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index a9799c7930..0000000000
--- a/.gitreview
+++ /dev/null
@@ -1,10 +0,0 @@
-[gerrit]
-defaultbranch=certified/18.9
-#
-# Intentional padding to ensure it is possible to point a commit
-# to an alternative gerrit server/repository without breaking
-# cherry-pick between branches.
-#
-host=gerrit.asterisk.org
-port=29418
-project=asterisk.git
diff --git a/BUGS b/BUGS
index 624459ea52..efb9bbd796 100644
--- a/BUGS
+++ b/BUGS
@@ -1,22 +1,22 @@
 Asterisk Bug Tracking Information
 =================================
 
-To learn about and report Asterisk bugs, please visit 
+To learn about and report Asterisk bugs, please visit
 the official Asterisk Bug Tracker at:
 
-	https://issues.asterisk.org/jira
+	https://github.com/asterisk/asterisk/issues/
 
-For more information on using the bug tracker, or to 
+For more information on using the bug tracker, or to
 learn how you can contribute by acting as a bug marshal
 please see:
 
-	http://www.asterisk.org/developers/bug-guidelines
+	https://wiki.asterisk.org/wiki/x/RgAtAQ
 
 If you would like to submit a feature request, please
 resist the temptation to post it to the bug tracker.
 Feature requests should be posted to the asterisk-dev
 mailing list, located at:
 
-	http://lists.digium.com 
+	http://lists.digium.com
 
 Thank you!
diff --git a/build_tools/make_version b/build_tools/make_version
index ad9fb3f924..e97897b701 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -1,190 +1,67 @@
 #!/bin/sh
 
-AWK=${AWK:-awk}
 GIT=${GIT:-git}
-GREP=${GREP:-grep}
+SED=${SED:-sed}
+AWK=${AWK:-awk}
 
 if [ -f ${1}/.version ]; then
     cat ${1}/.version
-elif [ -d ${1}/.svn ]; then
-    PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
-    BRANCH=0
-    TEAM=0
-    TAG=0
-    FEATURE=0
-
-    REV=`svnversion -c ${1} | cut -d: -f2`
-
-    INTEGRATED=`LANG=C svn pg automerge-propname ${1}`
-    if [ -z "${INTEGRATED}" ] ; then
-        INTEGRATED=svnmerge-integrated
-    fi
-
-    BASE=`LANG=C svn pg ${INTEGRATED} ${1} | cut -d: -f1`
-
-    if [ "${PARTS}" = "trunk" ] ; then
-        echo SVN-trunk-r${REV}
-        exit 0
-    fi
-
-    for PART in $PARTS ; do
-        if [ ${TAG} != 0 ] ; then
-            if [ "${PART}" = "autotag_for_be" ] ; then
-                continue
-            fi
-            if [ "${PART}" = "autotag_for_sx00i" ] ; then
-                continue
-            fi
-            RESULT="${PART}"
-            break
-        fi
+    exit 0
+fi
 
-        if [ ${BRANCH} != 0 ] ; then
-            RESULT="${RESULT}-${PART}"
-            if [ ${FEATURE} != 0 ] ; then
-                RESULT="${RESULT}-${FEATURE_NAME}"
-            fi
-            break
-        fi
+if [ ! -d ${1}/.git ]; then
+    echo "UNKNOWN__and_probably_unsupported"
+    exit 0
+fi
 
-        if [ ${TEAM} != 0 ] ; then
-            if [ -z "${RESULT}" ] ; then
-                RESULT="${PART}"
-            else
-                RESULT="${RESULT}-${PART}"
-            fi
-            continue
-        fi
+if [ -z ${GIT} ]; then
+    GIT="git"
+fi
 
-        if [ "${PART}" = "certified" ] ; then
-            FEATURE=1
-            FEATURE_NAME="cert"
-            continue
-        fi
+if ! command -v ${GIT} >/dev/null 2>&1; then
+    echo "UNKNOWN__and_probably_unsupported"
+    exit 1
+fi
 
-        if [ "${PART}" = "branches" ] ; then
-            BRANCH=1
-            RESULT="branch"
-            continue
-        fi
+GITCHECK=$(${GIT} describe --always 2>/dev/null || echo gitfail 2>/dev/null)
+if [ "x${GITCHECK}" = "xgitfail" ]; then
+    echo "UNKNOWN__git_check_fail"
+    exit 1
+fi
 
-        if [ "${PART}" = "tags" ] ; then
-            TAG=1
-            continue
-        fi
+cd ${1} || exit 1
 
-        if [ "${PART}" = "team" ] ; then
-            TEAM=1
-            continue
-        fi
-    done
+MODIFIED=""
 
-    if [ ${TAG} != 0 ] ; then
-        echo ${RESULT}
-    else
-        echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
-    fi
-elif [ -d ${1}/.git ]; then
-    if [ -z ${GIT} ]; then
-        GIT="git"
+# If MAINLINE_BRANCH is already set in the environment, use it.
+if [ -z "${MAINLINE_BRANCH}" ] ; then
+    # Try to retrieve MAINLINE_BRANCH from a local .develvars file first.
+    # .develvars is keyed by the branch name so we need to get that first.
+    BRANCH=$(${GIT} symbolic-ref --short HEAD 2>/dev/null)
+    if [ -f .develvars ] ; then
+        MAINLINE_BRANCH=$(${GIT} config -f .develvars --get branch.${BRANCH}.mainline-branch)
     fi
 
-    if ! command -v ${GIT} >/dev/null 2>&1; then
-        echo "UNKNOWN__and_probably_unsupported"
-        exit 1
+    # If we didn't find it, see if this is a well-known development branch.
+    # development/<mainline_branch>/<branchname> or
+    # devel/<mainline_branch>/<branchname>
+    if [ "x${MAINLINE_BRANCH}" = "x" ] ; then
+        MAINLINE_BRANCH=$(echo "${BRANCH}" | ${SED} -n -r -e "s@devel(opment)?/([0-9]+)/.+@\2@p")
     fi
-	cd ${1}
-
-    # If the first log commit messages indicates that this is checked into
-    # subversion, we'll just use the SVN- form of the revision.
-    MODIFIED=""
-    SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`
-    if [ -z "$SVN_REV" ]; then
-        MAINLINE_BRANCH=$(git config -f .gitreview --get gerrit.defaultbranch)
-        VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
-        if [ $? -ne 0 ]; then
-            if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
-                MODIFIED="M"
-            fi
-            # Some older versions of git do not support all the above
-            # options.
-            VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
-        fi
-        echo GIT-${MAINLINE_BRANCH}-${VERSION}
-    else
-        PARTS=`LANG=C ${GIT} log --pretty=full | ${GREP} -F "git-svn-id:" | head -1 | ${AWK} '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 's/@.*$//g'`
-        BRANCH=0
-        TEAM=0
-        TAG=0
-        FEATURE=0
-
-        if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
-            MODIFIED="M"
-        fi
-
-        for PART in $PARTS ; do
-            if [ ${TAG} != 0 ] ; then
-                if [ "${PART}" = "autotag_for_be" ] ; then
-                    continue
-                fi
-                if [ "${PART}" = "autotag_for_sx00i" ] ; then
-                    continue
-                fi
-                RESULT="${PART}"
-                break
-            fi
-
-            if [ ${BRANCH} != 0 ] ; then
-                RESULT="${RESULT}-${PART}"
-                if [ ${FEATURE} != 0 ] ; then
-                    RESULT="${RESULT}-${FEATURE_NAME}"
-                fi
-                break
-            fi
-
-            if [ ${TEAM} != 0 ] ; then
-                if [ -z "${RESULT}" ] ; then
-                    RESULT="${PART}"
-                else
-                    RESULT="${RESULT}-${PART}"
-                fi
-                continue
-            fi
 
-            if [ "${PART}" = "certified" ] ; then
-                FEATURE=1
-                FEATURE_NAME="cert"
-                continue
-            fi
-
-            if [ "${PART}" = "branches" ] ; then
-                BRANCH=1
-                RESULT="branch"
-                continue
-            fi
-
-            if [ "${PART}" = "tags" ] ; then
-                TAG=1
-                continue
-            fi
-
-            if [ "${PART}" = "team" ] ; then
-                TEAM=1
-                continue
-            fi
-
-            if [ "${PART}" = "trunk" ]; then
-                echo SVN-trunk-r${SVN_REV}${MODIFIED}
-                exit 0
-            fi
-        done
+    # If we didn't find it, get it from configure.ac.
+    if [ "x${MAINLINE_BRANCH}" = "x" ] ; then
+        MAINLINE_BRANCH=$(${AWK} '/AC_INIT/ { print substr($2, 2, length($2) - 3) }' configure.ac)
+    fi
+fi
 
-        if [ ${TAG} != 0 ] ; then
-            echo ${RESULT}
-        else
-            echo SVN-${RESULT##-}-r${SVN_REV}${MODIFIED}
-        fi
+VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
+if [ $? -ne 0 ]; then
+    if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
+        MODIFIED="M"
     fi
-else
-    echo "UNKNOWN__and_probably_unsupported"
+    # Some older versions of git do not support all the above
+    # options.
+    VERSION=`${GIT} rev-parse --short --verify HEAD`${MODIFIED}
 fi
+echo GIT-${MAINLINE_BRANCH}-${VERSION}
diff --git a/configs/samples/extensions.conf.sample b/configs/samples/extensions.conf.sample
index 8d6c3e89a1..4b265789ce 100644
--- a/configs/samples/extensions.conf.sample
+++ b/configs/samples/extensions.conf.sample
@@ -61,8 +61,9 @@ writeprotect=no
 ; this value to "yes" !!
 ; Please, if you try this out, and are forced to return to the
 ; old pattern matcher, please report your reasons in a bug report
-; on https://issues.asterisk.org. We have made good progress in providing
-; something compatible with the old matcher; help us finish the job!
+; on https://github.com/asterisk/asterisk/issues. We have made good
+; progress in providing something compatible with the old matcher; help us
+; finish the job!
 ;
 ; This value can be switched at runtime using the cli command "dialplan set extenpatternmatchnew true"
 ; or "dialplan set extenpatternmatchnew false", so you can experiment to your hearts content.
diff --git a/configure b/configure
index 1705820095..d83a127c6d 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for asterisk trunk.
+# Generated by GNU Autoconf 2.69 for asterisk certified/18.9.
 #
-# Report bugs to <https://issues.asterisk.org>.
+# Report bugs to <https://github.com/asterisk/asterisk/issues>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -269,8 +269,8 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: https://issues.asterisk.org about your system,
-$0: including any error possibly output before this
+$0: https://github.com/asterisk/asterisk/issues about your
+$0: system, including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
   fi
@@ -582,9 +582,9 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='asterisk'
 PACKAGE_TARNAME='asterisk'
-PACKAGE_VERSION='trunk'
-PACKAGE_STRING='asterisk trunk'
-PACKAGE_BUGREPORT='https://issues.asterisk.org'
+PACKAGE_VERSION='certified/18.9'
+PACKAGE_STRING='asterisk certified/18.9'
+PACKAGE_BUGREPORT='https://github.com/asterisk/asterisk/issues'
 PACKAGE_URL=''
 
 ac_unique_file="main/asterisk.c"
@@ -2055,7 +2055,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures asterisk trunk to adapt to many kinds of systems.
+\`configure' configures asterisk certified/18.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2121,7 +2121,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of asterisk trunk:";;
+     short | recursive ) echo "Configuration of asterisk certified/18.9:";;
    esac
   cat <<\_ACEOF
 
@@ -2303,7 +2303,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <https://issues.asterisk.org>.
+Report bugs to <https://github.com/asterisk/asterisk/issues>.
 _ACEOF
 ac_status=$?
 fi
@@ -2366,7 +2366,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-asterisk configure trunk
+asterisk configure certified/18.9
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2527,9 +2527,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------------------ ##
-## Report this to https://issues.asterisk.org ##
-## ------------------------------------------ ##"
+( $as_echo "## ---------------------------------------------------------- ##
+## Report this to https://github.com/asterisk/asterisk/issues ##
+## ---------------------------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -3152,7 +3152,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by asterisk $as_me trunk, which was
+It was created by asterisk $as_me certified/18.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -15300,7 +15300,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15346,7 +15346,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15370,7 +15370,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15415,7 +15415,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -15439,7 +15439,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -16739,6 +16739,8 @@ main ()
     if (*(data + i) != *(data3 + i))
       return 14;
   close (fd);
+  free (data);
+  free (data3);
   return 0;
 }
 _ACEOF
@@ -35834,7 +35836,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by asterisk $as_me trunk, which was
+This file was extended by asterisk $as_me certified/18.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -35890,13 +35892,13 @@ $config_files
 Configuration headers:
 $config_headers
 
-Report bugs to <https://issues.asterisk.org>."
+Report bugs to <https://github.com/asterisk/asterisk/issues>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-asterisk config.status trunk
+asterisk config.status certified/18.9
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 9fcea1816f..c6b10cc0f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.60a)
 
-AC_INIT([asterisk], [trunk], [https://issues.asterisk.org])
+AC_INIT([asterisk], [certified/18.9], [https://github.com/asterisk/asterisk/issues])
 
 # cross-compile macros
 AC_CANONICAL_BUILD
diff --git a/contrib/scripts/ast_grab_core b/contrib/scripts/ast_grab_core
old mode 100644
new mode 100755
index bc56b61878..6701a2d4e0
--- a/contrib/scripts/ast_grab_core
+++ b/contrib/scripts/ast_grab_core
@@ -67,4 +67,4 @@ echo Notifying admins of the core.
 echo Done.
 echo
 echo Reproducible deadlocks should be posted with a full backtrace and instructions
-echo to reproduce the issue at https://issues.asterisk.org/    Thanks!
+echo to reproduce the issue at https://github.com/asterisk/asterisk/issues/    Thanks!
diff --git a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
index e7c3d8fa3f..10f6b33d1b 100755
--- a/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
+++ b/contrib/scripts/sip_to_pjsip/sip_to_pjsip.py
@@ -1321,7 +1321,7 @@ if __name__ == "__main__":
     # configuration parser for sip.conf
     sip = astconfigparser.MultiOrderedConfigParser()
     info('Please, report any issue at:')
-    info('    https://issues.asterisk.org/')
+    info('    https://github.com/asterisk/asterisk/issues/')
     info('Reading ' + sip_filename)
     sip.read(sip_filename)
     info('Converting to PJSIP...')
diff --git a/contrib/scripts/sip_to_pjsip/sip_to_pjsql.py b/contrib/scripts/sip_to_pjsip/sip_to_pjsql.py
index 71ddd45b64..2469ffc9fe 100755
--- a/contrib/scripts/sip_to_pjsip/sip_to_pjsql.py
+++ b/contrib/scripts/sip_to_pjsip/sip_to_pjsql.py
@@ -70,7 +70,7 @@ if __name__ == "__main__":
     sip_to_pjsip.sip = sip
     sip.connect(user,password,host,port,database)
     print('Please, report any issue at:')
-    print('    https://issues.asterisk.org/')
+    print('    https://github.com/asterisk/asterisk/issues/')
     print('Reading ' + sip_filename)
     sip.read(sip_filename)
     print('Converting to PJSIP realtime sql...')
diff --git a/doc/asterisk.8 b/doc/asterisk.8
index e5991d9cf7..1afe0e2bcc 100644
--- a/doc/asterisk.8
+++ b/doc/asterisk.8
@@ -241,7 +241,7 @@ Enables executing of includes via \fB#exec\fR directive inside
 .PP
 \fBasterisk \-rx "core show channels"\fR - Display channels on running server
 .SH BUGS
-Bug reports and feature requests may be filed at https://issues.asterisk.org
+Bug reports and feature requests may be filed at https://github.com/asterisk/asterisk/issues/
 .SH "SEE ALSO"
 https://www.asterisk.org - The Asterisk Home Page
 .PP
diff --git a/doc/asterisk.sgml b/doc/asterisk.sgml
index 60450a014e..32a46e8258 100644
--- a/doc/asterisk.sgml
+++ b/doc/asterisk.sgml
@@ -415,7 +415,7 @@
  <refsect1>
   <title>BUGS</title>
   <para>
-  Bug reports and feature requests may be filed at https://issues.asterisk.org
+    Bug reports and feature requests may be filed at https://github.com/asterisk/asterisk/issues/
   </para>
  </refsect1>
  <refsect1>
diff --git a/include/asterisk/doxyref.h b/include/asterisk/doxyref.h
index d6daa85c80..0f6e36126b 100644
--- a/include/asterisk/doxyref.h
+++ b/include/asterisk/doxyref.h
@@ -54,7 +54,7 @@
  *
  * \section weblinks Web sites
  * \arg \b Main:  Asterisk Developer's website https://www.asterisk.org/developers/
- * \arg \b Bugs: The Issue Tracker https://issues.asterisk.org
+ * \arg \b Bugs: The Issue Tracker https://github.com/asterisk/asterisk/issues/
  * \arg \b Lists: List Server http://lists.digium.com
  * \arg \b Wiki: The Asterisk Wiki 	https://wiki.asterisk..org
  * \arg \b Docs: The Asterisk Documentation Project http://www.asteriskdocs.org
diff --git a/menuselect/README b/menuselect/README
index 3114e08340..d236168011 100644
--- a/menuselect/README
+++ b/menuselect/README
@@ -173,6 +173,6 @@ Conflicts:
 REPORTING BUGS
 
 Any bug reports or feature enhancement submissions to menuselect should be
-submitted at https://issues.asterisk.org/
+submitted at https://github.com/asterisk/asterisk/issues/
 
 Thank you!