diff --git a/PhysicsTools/NanoAOD/plugins/BuildFile.xml b/PhysicsTools/NanoAOD/plugins/BuildFile.xml
index e08787f2c59c3..b5bc373e6339f 100644
--- a/PhysicsTools/NanoAOD/plugins/BuildFile.xml
+++ b/PhysicsTools/NanoAOD/plugins/BuildFile.xml
@@ -2,6 +2,7 @@
 <use name="fastjet-contrib"/>
 <use name="roothistmatrix"/>
 <use name="tbb"/>
+<use name="tauolapp"/>
 <use name="CommonTools/Egamma"/>
 <use name="CondFormats/BTauObjects"/>
 <use name="CondFormats/DataRecord"/>
diff --git a/PhysicsTools/NanoAOD/plugins/TauSpinnerTableProducer.cc b/PhysicsTools/NanoAOD/plugins/TauSpinnerTableProducer.cc
new file mode 100644
index 0000000000000..bcf8b426abfb9
--- /dev/null
+++ b/PhysicsTools/NanoAOD/plugins/TauSpinnerTableProducer.cc
@@ -0,0 +1,248 @@
+/**\class TauSpinnerTableProducer
+
+ Description: Produces FlatTable with TauSpinner weights for H->tau,tau events
+
+ Original Author: D. Winterbottom (IC)
+ Update and adaptation to NanoAOD: M. Bluj (NCBJ)
+
+*/
+
+#include "FWCore/Framework/interface/one/EDProducer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Concurrency/interface/SharedResourceNames.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/ParameterSet/interface/allowedValues.h"
+#include "DataFormats/Common/interface/View.h"
+#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "DataFormats/NanoAOD/interface/FlatTable.h"
+
+#include "Tauola/Tauola.h"
+#include "TauSpinner/SimpleParticle.h"
+#include "TauSpinner/tau_reweight_lib.h"
+
+class TauSpinnerTableProducer : public edm::one::EDProducer<edm::one::SharedResources> {
+public:
+  explicit TauSpinnerTableProducer(const edm::ParameterSet &);
+
+  void produce(edm::Event &, const edm::EventSetup &) final;
+  void beginJob() final;
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
+    edm::ParameterSetDescription desc;
+    desc.add<edm::InputTag>("src")->setComment("input genParticle collection");
+    desc.add<std::string>("name")->setComment("name of the TauSpinner weights table");
+    desc.add<std::vector<double>>("theta")->setComment("values of CP-even and CP-odd tau Yukawa mixing angle");
+    desc.ifValue(edm::ParameterDescription<int>("bosonPdgId", 25, true), edm::allowedValues<int>(25, 35, 36))
+        ->setComment("boson pdgId, default: 25");  // Allow only neutral Higgs bosons
+    desc.add<double>("defaultWeight", 1)
+        ->setComment("default weight stored in case of presence of a tau decay unsupported by TauSpinner");
+    descriptions.addWithDefaultLabel(desc);
+  }
+
+private:
+  void getBosons(edm::RefVector<edm::View<reco::GenParticle>> &bosons, const edm::View<reco::GenParticle> &parts) const;
+  static reco::GenParticleRef getLastCopy(const reco::GenParticleRef &part);
+  static void getTaus(reco::GenParticleRefVector &taus, const reco::GenParticle &boson);
+  static bool getTauDaughters(reco::GenParticleRefVector &tau_daughters, const reco::GenParticle &tau);
+  TauSpinner::SimpleParticle convertToSimplePart(const reco::GenParticle &input_part) const {
+    return TauSpinner::SimpleParticle(
+        input_part.px(), input_part.py(), input_part.pz(), input_part.energy(), input_part.pdgId());
+  }
+
+  static std::vector<std::pair<std::string, double>> nameAndValue(const std::vector<double> &val_vec) {
+    std::vector<std::pair<std::string, double>> out;
+    for (auto val : val_vec) {
+      std::string name = std::to_string(val);
+      name.erase(name.find_last_not_of('0') + 1, std::string::npos);
+      name.erase(name.find_last_not_of('.') + 1, std::string::npos);
+      size_t pos = name.find(".");
+      if (pos != std::string::npos)
+        name.replace(pos, 1, "p");
+      pos = name.find("-");
+      if (pos != std::string::npos)
+        name.replace(pos, 1, "minus");
+      out.push_back(std::make_pair(name, val));
+    }
+    return out;
+  }
+
+  void printModuleInfo(edm::ParameterSet const &config) const {
+    std::cout << std::string(78, '-') << "\n";
+    std::cout << config.getParameter<std::string>("@module_type") << '/'
+              << config.getParameter<std::string>("@module_label") << "\n";
+    std::cout << "Input collection: " << config.getParameter<edm::InputTag>("src").encode() << '\n';
+    std::cout << "Table name: " << config.getParameter<std::string>("name") << '\n';
+    std::string thetaStr;
+    for (const auto &theta : theta_vec_)
+      thetaStr += theta.first + ",";
+    std::cout << "Theta: " << thetaStr << std::endl;
+  }
+
+  const edm::EDGetTokenT<edm::View<reco::GenParticle>> genPartsToken_;
+  const std::string name_;
+  const std::vector<std::pair<std::string, double>> theta_vec_;
+  const int bosonPdgId_;
+  const std::string tauSpinnerPDF_;
+  const bool ipp_;
+  const int ipol_;
+  const int nonSM2_;
+  const int nonSMN_;
+  const double cmsE_;
+  const double default_weight_;
+};
+
+TauSpinnerTableProducer::TauSpinnerTableProducer(const edm::ParameterSet &config)
+    : genPartsToken_(consumes(config.getParameter<edm::InputTag>("src"))),
+      name_(config.getParameter<std::string>("name")),
+      theta_vec_(nameAndValue(config.getParameter<std::vector<double>>("theta"))),
+      bosonPdgId_(config.getParameter<int>("bosonPdgId")),
+      tauSpinnerPDF_(
+          "NNPDF31_nnlo_hessian_pdfas"),  // PDF set for TauSpinner, relevant only in case of Z/gamma* polarization weights (set "sensible" default)
+      ipp_(true),  // pp collisions
+      ipol_(0),
+      nonSM2_(0),
+      nonSMN_(0),
+      cmsE_(
+          13600),  // collision energy in GeV, relevant only in case of Z/gamma* polarization weights (set "sensible" default)
+      default_weight_(config.getParameter<double>(
+          "defaultWeight"))  // default weight stored in case of presence of a tau decay unsupported by TauSpinner
+{
+  printModuleInfo(config);
+
+  // State that we use tauola/tauspinner resource
+  usesResource(edm::SharedResourceNames::kTauola);
+
+  produces<nanoaod::FlatTable>();
+}
+
+void TauSpinnerTableProducer::getBosons(edm::RefVector<edm::View<reco::GenParticle>> &bosons,
+                                        const edm::View<reco::GenParticle> &parts) const {
+  unsigned idx = 0;
+  for (const auto &part : parts) {
+    if (std::abs(part.pdgId()) == bosonPdgId_ && part.isLastCopy()) {
+      edm::Ref<edm::View<reco::GenParticle>> partRef(&parts, idx);
+      bosons.push_back(partRef);
+    }
+    ++idx;
+  }
+}
+
+reco::GenParticleRef TauSpinnerTableProducer::getLastCopy(const reco::GenParticleRef &part) {
+  if (part->statusFlags().isLastCopy())
+    return part;
+  for (const auto &daughter : part->daughterRefVector()) {
+    if (daughter->pdgId() == part->pdgId() && daughter->statusFlags().fromHardProcess()) {
+      return getLastCopy(daughter);
+    }
+  }
+  throw std::runtime_error("getLastCopy: no last copy found");
+}
+
+void TauSpinnerTableProducer::getTaus(reco::GenParticleRefVector &taus, const reco::GenParticle &boson) {
+  for (const auto &daughterRef : boson.daughterRefVector()) {
+    if (std::abs(daughterRef->pdgId()) == 15)
+      taus.push_back(getLastCopy(daughterRef));
+  }
+}
+
+bool TauSpinnerTableProducer::getTauDaughters(reco::GenParticleRefVector &tau_daughters, const reco::GenParticle &tau) {
+  static const std::set<int> directTauProducts = {11, 12, 13, 14, 16, 22};
+  static const std::set<int> finalHadrons = {111, 130, 211, 310, 311, 321};
+  static const std::set<int> intermediateHadrons = {221, 223, 323};
+  for (auto daughterRef : tau.daughterRefVector()) {
+    const int daughter_pdgId = std::abs(daughterRef->pdgId());
+    if ((std::abs(tau.pdgId()) == 15 && directTauProducts.count(daughter_pdgId)) ||
+        finalHadrons.count(daughter_pdgId)) {
+      tau_daughters.push_back(daughterRef);
+    } else if (intermediateHadrons.count(daughter_pdgId)) {
+      if (!getTauDaughters(tau_daughters, *daughterRef))
+        return false;
+    } else {
+      edm::LogWarning("TauSpinnerTableProducer::getTauDaughters")
+          << "Unsupported decay with " << daughter_pdgId << " being daughter of " << std::abs(tau.pdgId()) << "\n";
+      return false;
+    }
+  }
+  return true;
+}
+
+void TauSpinnerTableProducer::beginJob() {
+  // Initialize TauSpinner
+  Tauolapp::Tauola::setNewCurrents(0);
+  Tauolapp::Tauola::initialize();
+  LHAPDF::initPDFSetByName(tauSpinnerPDF_);
+  TauSpinner::initialize_spinner(ipp_, ipol_, nonSM2_, nonSMN_, cmsE_);
+}
+
+void TauSpinnerTableProducer::produce(edm::Event &event, const edm::EventSetup &setup) {
+  // Input gen-particles collection
+  auto const &genParts = event.get(genPartsToken_);
+
+  // Output table
+  auto wtTable = std::make_unique<nanoaod::FlatTable>(1, name_, true);
+  wtTable->setDoc("TauSpinner weights");
+
+  // Search for boson
+  edm::RefVector<edm::View<reco::GenParticle>> bosons;
+  getBosons(bosons, genParts);
+  if (bosons.size() !=
+      1) {  // no boson found or more than one found, produce empty table (expected for non HTT samples)
+    event.put(std::move(wtTable));
+    return;
+  }
+
+  // Search for taus from boson decay
+  reco::GenParticleRefVector taus;
+  getTaus(taus, *bosons[0]);
+  if (taus.size() != 2) {  // boson does not decay to tau pair, produce empty table (expected for non HTT samples)
+    event.put(std::move(wtTable));
+    return;
+  }
+
+  // Get tau daughters and convert all particles to TauSpinner format
+  TauSpinner::SimpleParticle simple_boson = convertToSimplePart(*bosons[0]);
+  std::array<TauSpinner::SimpleParticle, 2> simple_taus;
+  std::array<std::vector<TauSpinner::SimpleParticle>, 2> simple_tau_daughters;
+  bool supportedDecays = true;
+  for (size_t tau_idx = 0; tau_idx < 2; ++tau_idx) {
+    simple_taus[tau_idx] = convertToSimplePart(*taus[tau_idx]);
+    reco::GenParticleRefVector tau_daughters;
+    supportedDecays &= getTauDaughters(tau_daughters, *taus[tau_idx]);
+    for (const auto &daughterRef : tau_daughters)
+      simple_tau_daughters[tau_idx].push_back(convertToSimplePart(*daughterRef));
+  }
+
+  // Compute TauSpinner weights and fill table
+  std::array<double, 2> weights;
+  for (const auto &theta : theta_vec_) {
+    // Can make this more general by having boson pdgid as input or have option for set boson type
+    TauSpinner::setHiggsParametersTR(-cos(2 * M_PI * theta.second),
+                                     cos(2 * M_PI * theta.second),
+                                     -sin(2 * M_PI * theta.second),
+                                     -sin(2 * M_PI * theta.second));
+    for (size_t i = 0; i < weights.size(); ++i) {
+      Tauolapp::Tauola::setNewCurrents(i);
+      weights[i] =
+          supportedDecays
+              ? TauSpinner::calculateWeightFromParticlesH(
+                    simple_boson, simple_taus[0], simple_taus[1], simple_tau_daughters[0], simple_tau_daughters[1])
+              : default_weight_;
+    }
+    // Nominal weights for setNewCurrents(0)
+    wtTable->addColumnValue<double>(
+        "weight_cp_" + theta.first, weights[0], "TauSpinner weight for theta_CP=" + theta.first);
+    // Weights for alternative hadronic currents (can be used for uncertainty estimates)
+    wtTable->addColumnValue<double>(
+        "weight_cp_" + theta.first + "_alt",
+        weights[1],
+        "TauSpinner weight for theta_CP=" + theta.first + " (alternative hadronic currents)");
+  }
+
+  event.put(std::move(wtTable));
+}
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+DEFINE_FWK_MODULE(TauSpinnerTableProducer);
diff --git a/PhysicsTools/NanoAOD/python/nano_cff.py b/PhysicsTools/NanoAOD/python/nano_cff.py
index 79bebecbd03d4..5f90c9284fa17 100644
--- a/PhysicsTools/NanoAOD/python/nano_cff.py
+++ b/PhysicsTools/NanoAOD/python/nano_cff.py
@@ -18,6 +18,7 @@
 from PhysicsTools.NanoAOD.genparticles_cff import *
 from PhysicsTools.NanoAOD.particlelevel_cff import *
 from PhysicsTools.NanoAOD.genWeightsTable_cfi import *
+from PhysicsTools.NanoAOD.tauSpinnerTable_cfi import *
 from PhysicsTools.NanoAOD.genVertex_cff import *
 from PhysicsTools.NanoAOD.vertices_cff import *
 from PhysicsTools.NanoAOD.met_cff import *
@@ -96,7 +97,7 @@
     genParticleTask, particleLevelTask, jetMCTask, muonMCTask, electronMCTask, lowPtElectronMCTask, photonMCTask,
     tauMCTask, boostedTauMCTask,
     metMCTable, ttbarCatMCProducersTask, globalTablesMCTask, ttbarCategoryTableTask,
-    genWeightsTableTask, genVertexTablesTask, genParticleTablesTask, genProtonTablesTask, particleLevelTablesTask
+    genWeightsTableTask, genVertexTablesTask, genParticleTablesTask, genProtonTablesTask, particleLevelTablesTask, tauSpinnerTableTask
 )
 
 nanoSequenceFS = cms.Sequence(nanoSequenceCommon + cms.Sequence(nanoTableTaskFS))
diff --git a/PhysicsTools/NanoAOD/python/tauSpinnerTable_cfi.py b/PhysicsTools/NanoAOD/python/tauSpinnerTable_cfi.py
new file mode 100644
index 0000000000000..64bbbff412044
--- /dev/null
+++ b/PhysicsTools/NanoAOD/python/tauSpinnerTable_cfi.py
@@ -0,0 +1,11 @@
+import FWCore.ParameterSet.Config as cms
+from PhysicsTools.NanoAOD.tauSpinnerTableProducer_cfi import tauSpinnerTableProducer
+
+tauSpinnerTable = tauSpinnerTableProducer.clone(
+    src = 'prunedGenParticles',
+    name = 'TauSpinner',
+    theta = [0, 0.25, 0.5, -0.25, 0.375],
+    defaultWeight = 1
+)
+
+tauSpinnerTableTask = cms.Task(tauSpinnerTable)