diff --git a/app/jobs/regenerate_subzone_whoises_job.rb b/app/jobs/regenerate_subzone_whoises_job.rb
new file mode 100644
index 000000000..280fa4088
--- /dev/null
+++ b/app/jobs/regenerate_subzone_whoises_job.rb
@@ -0,0 +1,11 @@
+class RegenerateSubzoneWhoisesJob < Que::Job
+  def run
+    subzones = DNS::Zone.all
+
+    subzones.each do |zone|
+      next unless zone.subzone?
+
+      UpdateWhoisRecordJob.enqueue zone.origin, 'zone'
+    end
+  end
+end
diff --git a/test/jobs/regeneate_subzone_whoises_job_test.rb b/test/jobs/regeneate_subzone_whoises_job_test.rb
new file mode 100644
index 000000000..745c2392c
--- /dev/null
+++ b/test/jobs/regeneate_subzone_whoises_job_test.rb
@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class RegenerateSubzoneWhoisesJobTest < ActiveSupport::TestCase
+  def test_regenerates_whois_data_only_for_subzones
+    subzone = dns_zones(:one).dup
+    subzone.origin = 'subzone.test'
+    subzone.save
+
+    Whois::Record.where(name: subzone.origin).destroy_all
+    Whois::Record.where(name: dns_zones(:one)).destroy_all
+    assert_nil Whois::Record.find_by(name: subzone.origin)
+    assert_nil Whois::Record.find_by(name: dns_zones(:one).origin)
+
+    RegenerateSubzoneWhoisesJob.run
+    assert Whois::Record.find_by(name: subzone.origin)
+    assert_nil Whois::Record.find_by(name: dns_zones(:one).origin)
+  end
+end