diff --git a/bin/phpcs-whitelist.js b/bin/phpcs-whitelist.js
index 7df60342ead30..2f708763af22f 100644
--- a/bin/phpcs-whitelist.js
+++ b/bin/phpcs-whitelist.js
@@ -42,6 +42,7 @@ module.exports = [
 	'modules/verification-tools.php',
 	'modules/widgets/contact-info.php',
 	'modules/widgets/social-icons.php',
+	'modules/woocommerce-analytics.php',
 	'modules/wpcom-block-editor/class-jetpack-wpcom-block-editor.php',
 	'modules/wpcom-tos/wpcom-tos.php',
 	'packages',
diff --git a/class.jetpack-admin.php b/class.jetpack-admin.php
index 700f9889a5fe7..5579c62228da3 100644
--- a/class.jetpack-admin.php
+++ b/class.jetpack-admin.php
@@ -191,6 +191,20 @@ static function is_module_available( $module ) {
 			return false;
 		}
 
+		/*
+		 * WooCommerce Analytics should only be available
+		 * when running WooCommerce 3+
+		 */
+		if (
+			'woocommerce-analytics' === $module['module']
+			&& (
+				! class_exists( 'WooCommerce' )
+				|| version_compare( WC_VERSION, '3.0', '<' )
+			)
+		) {
+			return false;
+		}
+
 		if ( ( new Status() )->is_development_mode() ) {
 			return ! ( $module['requires_connection'] );
 		} else {
diff --git a/modules/module-extras.php b/modules/module-extras.php
index 7cbb9f61321d0..3f2d3d3890c2a 100644
--- a/modules/module-extras.php
+++ b/modules/module-extras.php
@@ -46,7 +46,6 @@
 	'calypsoify/class.jetpack-calypsoify.php',
 	'plugin-search.php',
 	'simple-payments/simple-payments.php',
-	'woocommerce-analytics/wp-woocommerce-analytics.php',
 	'wpcom-block-editor/class-jetpack-wpcom-block-editor.php',
 	'wpcom-tos/wpcom-tos.php',
 );
diff --git a/modules/module-headings.php b/modules/module-headings.php
index f7592d12a9f7a..32361d2e7714b 100644
--- a/modules/module-headings.php
+++ b/modules/module-headings.php
@@ -212,6 +212,11 @@ function jetpack_get_module_i18n( $key ) {
 				'description' => _x( 'Provides additional widgets for use on your site.', 'Module Description', 'jetpack' ),
 			),
 
+			'woocommerce-analytics' => array(
+				'name' => _x( 'WooCommerce Analytics', 'Module Name', 'jetpack' ),
+				'description' => _x( 'Enhanced analytics for WooCommerce and Jetpack users.', 'Module Description', 'jetpack' ),
+			),
+
 			'wordads' => array(
 				'name' => _x( 'Ads', 'Module Name', 'jetpack' ),
 				'description' => _x( 'Earn income by allowing Jetpack to display high quality ads.', 'Module Description', 'jetpack' ),
@@ -234,6 +239,7 @@ function jetpack_get_module_i18n_tag( $key ) {
 			// Modules with `Other` tag:
 			//  - modules/contact-form.php
 			//  - modules/notes.php
+			//  - modules/woocommerce-analytics.php
 			'Other' =>_x( 'Other', 'Module Tag', 'jetpack' ),
 
 			// Modules with `Photos and Videos` tag:
@@ -300,6 +306,7 @@ function jetpack_get_module_i18n_tag( $key ) {
 			//  - modules/sharedaddy.php
 			//  - modules/sitemaps.php
 			//  - modules/stats.php
+			//  - modules/woocommerce-analytics.php
 			'Recommended' =>_x( 'Recommended', 'Module Tag', 'jetpack' ),
 
 			// Modules with `General` tag:
diff --git a/modules/module-info.php b/modules/module-info.php
index 5fb9eacb52baa..98037d761423e 100644
--- a/modules/module-info.php
+++ b/modules/module-info.php
@@ -784,7 +784,7 @@ function jetpack_google_analytics_more_info() {
  * WooCommerce Analytics support link.
  */
 function jetpack_woocommerce_analytics_more_link() {
-	echo 'https://jetpack.com/support/';
+	echo 'https://jetpack.com/support/woocommerce-analytics/';
 }
 add_action( 'jetpack_learn_more_button_woocommerce-analytics', 'jetpack_woocommerce_analytics_more_link' );
 
diff --git a/modules/woocommerce-analytics.php b/modules/woocommerce-analytics.php
new file mode 100644
index 0000000000000..69fe6b6008dc9
--- /dev/null
+++ b/modules/woocommerce-analytics.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Module Name: WooCommerce Analytics
+ * Module Description: Enhanced analytics for WooCommerce and Jetpack users.
+ * Sort Order: 13
+ * First Introduced: 8.4
+ * Requires Connection: Yes
+ * Auto Activate: Yes
+ * Module Tags: Other, Recommended
+ * Feature: Engagement
+ * Additional Search Queries: woocommerce, analytics, stats, statistics, tracking, analytics, views
+ *
+ * @package Jetpack
+ */
+
+/**
+ * Load module functionality.
+ */
+function jetpack_load_woocommerce_analytics() {
+	require_once dirname( __FILE__ ) . '/woocommerce-analytics/wp-woocommerce-analytics.php';
+}
+jetpack_load_woocommerce_analytics();