diff --git a/src/wp-admin/includes/schema.php b/src/wp-admin/includes/schema.php
index 8ea0b3680291c..c0b1290980bde 100644
--- a/src/wp-admin/includes/schema.php
+++ b/src/wp-admin/includes/schema.php
@@ -274,7 +274,7 @@ function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
 CREATE TABLE $wpdb->registration_log (
 	ID bigint(20) unsigned NOT NULL auto_increment,
 	email varchar(255) NOT NULL default '',
-	IP varchar(30) NOT NULL default '',
+	IP varchar(39) NOT NULL default '',
 	blog_id bigint(20) unsigned NOT NULL default '0',
 	date_registered datetime NOT NULL default '0000-00-00 00:00:00',
 	PRIMARY KEY  (ID),
diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index 914113bde00d0..94ffdfb867223 100644
--- a/src/wp-admin/includes/upgrade.php
+++ b/src/wp-admin/includes/upgrade.php
@@ -3743,7 +3743,7 @@ function pre_schema_upgrade() {
 	}
 
 	// Multisite schema upgrades.
-	if ( $wp_current_db_version < 60497 && is_multisite() && wp_should_upgrade_global_tables() ) {
+	if ( $wp_current_db_version < 60498 && is_multisite() && wp_should_upgrade_global_tables() ) { // TODO: Update with commit.
 
 		// Upgrade versions prior to 3.7.
 		if ( $wp_current_db_version < 25179 ) {
@@ -3771,6 +3771,9 @@ function pre_schema_upgrade() {
 			$wpdb->query( "ALTER TABLE $wpdb->sitemeta MODIFY site_id bigint(20) unsigned NOT NULL default 0" );
 			$wpdb->query( "ALTER TABLE $wpdb->signups MODIFY signup_id bigint(20) unsigned NOT NULL auto_increment" );
 		}
+		if ( $wp_current_db_version < 60498 ) { // TODO: Update with commit.
+				$wpdb->query( "ALTER TABLE $wpdb->registration_log MODIFY IP varchar(39) NOT NULL default ''" );
+		}
 	}
 
 	// Upgrade versions prior to 4.2.
diff --git a/src/wp-includes/ms-functions.php b/src/wp-includes/ms-functions.php
index 3da25da165b63..13c3f0910271a 100644
--- a/src/wp-includes/ms-functions.php
+++ b/src/wp-includes/ms-functions.php
@@ -2122,7 +2122,7 @@ function wpmu_log_new_registrations( $blog_id, $user_id ) {
 			$wpdb->registration_log,
 			array(
 				'email'           => $user->user_email,
-				'IP'              => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ),
+				'IP'              => preg_replace( '/[^a-f0-9:.]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ),
 				'blog_id'         => $blog_id,
 				'date_registered' => current_time( 'mysql' ),
 			)