diff --git a/docs/changes.txt b/docs/changes.txt
index 230b970c86..98a0ebba6e 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -615,6 +615,7 @@ wxMSW:
 - Fix wxEVT_TREE_STATE_IMAGE_CLICK generation (Antal).
 - Fix wxDV_ROW_LINES in horizontally scrolled wxDataViewCtrl.
 - Fix RegisterHotKey() with negative IDs (troelsk).
+- Fix event object type for wxEVT_SPINCTRL events.
 
 wxOSX:
 
diff --git a/src/common/event.cpp b/src/common/event.cpp
index d92a4acf0e..b81c173122 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -179,8 +179,6 @@ wxDEFINE_EVENT( wxEVT_VLBOX, wxCommandEvent );
 wxDEFINE_EVENT( wxEVT_COMBOBOX, wxCommandEvent );
 wxDEFINE_EVENT( wxEVT_TOOL_RCLICKED, wxCommandEvent );
 wxDEFINE_EVENT( wxEVT_TOOL_ENTER, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_SPINCTRL, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_SPINCTRLDOUBLE, wxCommandEvent );
 wxDEFINE_EVENT( wxEVT_TOOL_DROPDOWN, wxCommandEvent );
 wxDEFINE_EVENT( wxEVT_COMBOBOX_DROPDOWN, wxCommandEvent);
 wxDEFINE_EVENT( wxEVT_COMBOBOX_CLOSEUP, wxCommandEvent);
diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index e37bd6737f..79de856b28 100644
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -82,7 +82,7 @@ static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win
     if (!win->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    wxCommandEvent event( wxEVT_SPINCTRL, win->GetId());
+    wxSpinEvent event( wxEVT_SPINCTRL, win->GetId());
     event.SetEventObject( win );
 
     // note that we don't use wxSpinCtrl::GetValue() here because it would
diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 4610eef008..a32d224b00 100644
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -670,7 +670,7 @@ void wxSpinCtrl::DoSetToolTip(wxToolTip *tip)
 
 void wxSpinCtrl::SendSpinUpdate(int value)
 {
-    wxCommandEvent event(wxEVT_SPINCTRL, GetId());
+    wxSpinEvent event(wxEVT_SPINCTRL, GetId());
     event.SetEventObject(this);
     event.SetInt(value);