diff --git a/src/Mod/Drawing/App/AppDrawing.cpp b/src/Mod/Drawing/App/AppDrawing.cpp
index 915064a3a9..6edecc46e0 100644
--- a/src/Mod/Drawing/App/AppDrawing.cpp
+++ b/src/Mod/Drawing/App/AppDrawing.cpp
@@ -15,6 +15,7 @@
 #endif
 
 #include <Base/Console.h>
+#include <Base/PyObjectBase.h>
 #include <Base/Interpreter.h>
  
 #include "FeaturePage.h"
@@ -33,7 +34,7 @@ extern PyObject* initModule();
 }
 
 /* Python entry */
-PyMODINIT_FUNC initDrawing()
+PyMOD_INIT_FUNC(Drawing)
 {
     // load dependent module
     try {
@@ -42,9 +43,9 @@ PyMODINIT_FUNC initDrawing()
     }
     catch(const Base::Exception& e) {
         PyErr_SetString(PyExc_ImportError, e.what());
-        return;
+        PyMOD_Return(0);
     }
-    (void)Drawing::initModule();
+    PyObject* mod = Drawing::initModule();
     Base::Console().Log("Loading Drawing module... done\n");
 
 
@@ -63,4 +64,6 @@ PyMODINIT_FUNC initDrawing()
     Drawing::FeatureViewSymbol      ::init();
     Drawing::FeatureClip            ::init();
     Drawing::FeatureViewSpreadsheet ::init();
+
+    PyMOD_Return(mod);
 }
diff --git a/src/Mod/Drawing/Gui/AppDrawingGui.cpp b/src/Mod/Drawing/Gui/AppDrawingGui.cpp
index d45a891734..352ce705a6 100644
--- a/src/Mod/Drawing/Gui/AppDrawingGui.cpp
+++ b/src/Mod/Drawing/Gui/AppDrawingGui.cpp
@@ -49,14 +49,14 @@ extern PyObject* initModule();
 
 
 /* Python entry */
-PyMODINIT_FUNC initDrawingGui()
+PyMOD_INIT_FUNC(DrawingGui)
 {
     if (!Gui::Application::Instance) {
         PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application.");
-        return;
+        PyMOD_Return(0);
     }
 
-    (void) DrawingGui::initModule();
+    PyObject* mod = DrawingGui::initModule();
     Base::Console().Log("Loading GUI of Drawing module... done\n");
 
     // instantiating the commands
@@ -70,4 +70,5 @@ PyMODINIT_FUNC initDrawingGui()
 
     // add resources and reloads the translators
     loadDrawingResource();
+    PyMOD_Return(mod);
 }