diff --git a/buildtools/build_wxwidgets.py b/buildtools/build_wxwidgets.py
index 2c7e9e76..2a1c2f55 100644
--- a/buildtools/build_wxwidgets.py
+++ b/buildtools/build_wxwidgets.py
@@ -289,7 +289,6 @@ def main(wxDir, args):
                             "--disable-debugreport",
                             "--enable-uiactionsim",
                             "--enable-autoidman",
-                            "--disable-nativeanimation",
                             ]
 
         if sys.platform.startswith("darwin"):
@@ -406,7 +405,6 @@ def main(wxDir, args):
             flags["wxUSE_IFF"] = "1"
             flags["wxUSE_ACCESSIBILITY"] = "1"
             flags["wxUSE_WINRT"] = "0"
-            flags["wxUSE_NATIVE_ANIMATIONCTRL"] = "0"
 
             # Remove this when Windows XP finally dies, or when there is a
             # solution for ticket #13116...
diff --git a/docs/sphinx/itemToModuleMap.json b/docs/sphinx/itemToModuleMap.json
index e4481a5d..6bd09065 100644
--- a/docs/sphinx/itemToModuleMap.json
+++ b/docs/sphinx/itemToModuleMap.json
@@ -306,6 +306,7 @@
 "AlphaPixelData_Accessor":"wx.",
 "Animation":"wx.adv.",
 "AnimationCtrl":"wx.adv.",
+"AnimationCtrlGeneric":"wx.adv.",
 "AnimationCtrlNameStr":"wx.adv.",
 "AnimationDecoder":"wx.adv.",
 "AnimationDisposal":"wx.adv.",
@@ -1355,6 +1356,7 @@
 "Gauge":"wx.",
 "GaugeNameStr":"wx.",
 "GenericAboutBox":"wx.adv.",
+"GenericAnimationCtrl":"wx.adv.",
 "GenericCalendarCtrl":"wx.adv.",
 "GenericDatePickerCtrl":"wx.adv.",
 "GenericDirCtrl":"wx.",
diff --git a/etg/animate.py b/etg/animate.py
index a93b784e..697bf304 100644
--- a/etg/animate.py
+++ b/etg/animate.py
@@ -53,10 +53,15 @@ def run():
     module.addItem(tools.wxListWrapperTemplate('wxAnimationDecoderList', 'wxAnimationDecoder', module,
                                                header_extra='#include <wx/animate.h>'))
 
+
     c = module.find('wxAnimationCtrl')
     tools.fixWindowClass(c)
     module.addGlobalStr('wxAnimationCtrlNameStr', c)
 
+    # Add the generic class too
+    gen = tools.copyClassDef(c, 'wxGenericAnimationCtrl')
+    module.insertItemAfter(c, gen)
+
     # move this before wxAnimationCtrl so it can be used for default arg values
     item = module.find('wxNullAnimation')
     module.items.remove(item)