diff --git a/docs/sphinx/itemToModuleMap.json b/docs/sphinx/itemToModuleMap.json
index 6bd09065..f7579478 100644
--- a/docs/sphinx/itemToModuleMap.json
+++ b/docs/sphinx/itemToModuleMap.json
@@ -305,6 +305,7 @@
 "AlphaPixelData":"wx.",
 "AlphaPixelData_Accessor":"wx.",
 "Animation":"wx.adv.",
+"AnimationBase":"wx.adv.",
 "AnimationCtrl":"wx.adv.",
 "AnimationCtrlGeneric":"wx.adv.",
 "AnimationCtrlNameStr":"wx.adv.",
@@ -1356,6 +1357,7 @@
 "Gauge":"wx.",
 "GaugeNameStr":"wx.",
 "GenericAboutBox":"wx.adv.",
+"GenericAnimation":"wx.adv.",
 "GenericAnimationCtrl":"wx.adv.",
 "GenericCalendarCtrl":"wx.adv.",
 "GenericDatePickerCtrl":"wx.adv.",
@@ -2530,6 +2532,7 @@
 "NullColour":"wx.",
 "NullCursor":"wx.",
 "NullFont":"wx.",
+"NullGenericAnimation":"wx.adv.",
 "NullGraphicsBitmap":"wx.",
 "NullGraphicsBrush":"wx.",
 "NullGraphicsFont":"wx.",
diff --git a/etg/animate.py b/etg/animate.py
index 21852d0f..894ca9dd 100644
--- a/etg/animate.py
+++ b/etg/animate.py
@@ -17,7 +17,10 @@ DOCSTRING = ""
 
 # The classes and/or the basename of the Doxygen XML files to be processed by
 # this script.
-ITEMS  = [ "wxAnimation",
+ITEMS  = [ "wxAnimationBase",
+           "wxGenericAnimation",
+           "wxGenericAnimationCtrl",
+           "wxAnimation",
            "wxAnimationCtrl",
            "wxAnimationDecoder",
            "wxANIDecoder",
@@ -35,29 +38,29 @@ def run():
     # Tweak the parsed meta objects in the module object as needed for
     # customizing the generated code and docstrings.
 
-    c = module.find('wxAnimation')
-    assert isinstance(c, etgtools.ClassDef)
-
-    #c.find('GetHandlers').ignore()
-    module.addItem(tools.wxListWrapperTemplate('wxAnimationDecoderList', 'wxAnimationDecoder', module,
-                                               header_extra='#include <wx/animate.h>'))
-
+    c = module.find('wxGenericAnimationCtrl')
+    tools.fixWindowClass(c)
 
     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)
     module.insertItemBefore(c, item)
 
+    item = module.find('wxNullGenericAnimation')
+    module.items.remove(item)
+    module.insertItemBefore(c, item)
+
 
     #-----------------------------------------------------------------
+    module.addItem(tools.wxListWrapperTemplate('wxAnimationDecoderList', 'wxAnimationDecoder', module,
+                                               header_extra='#include <wx/animate.h>'))
+
     c = module.find('wxAnimationDecoder')
     c.find('DoCanRead').ignore(False)