diff --git a/pcbnew/plugins/eagle/eagle_plugin.cpp b/pcbnew/plugins/eagle/eagle_plugin.cpp
index 7315400b8a..40e39219c9 100644
--- a/pcbnew/plugins/eagle/eagle_plugin.cpp
+++ b/pcbnew/plugins/eagle/eagle_plugin.cpp
@@ -1967,6 +1967,9 @@ void EAGLE_PLUGIN::packagePad( FOOTPRINT* aFootprint, wxXmlNode* aTree )
     if( e.rot )
         pad->SetOrientation( EDA_ANGLE( e.rot->degrees, DEGREES_T ) );
 
+    // Eagle spokes are always NSEW in board coordinates
+    pad->SetThermalSpokeAngle( - ( aFootprint->GetOrientation() + pad->GetOrientation() ) );
+
     if( pad->GetSizeX() > 0 && pad->GetSizeY() > 0 )
     {
         aFootprint->Add( pad.release() );
@@ -2458,6 +2461,9 @@ void EAGLE_PLUGIN::packageSMD( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
     if( e.rot )
         pad->SetOrientation( EDA_ANGLE( e.rot->degrees, DEGREES_T ) );
 
+    // Eagle spokes are always NSEW in board coordinates
+    pad->SetThermalSpokeAngle( - ( aFootprint->GetOrientation() + pad->GetOrientation() ) );
+
     pad->SetLocalSolderPasteMargin( -eagleClamp( m_rules->mlMinCreamFrame,
                                                  (int) ( m_rules->mvCreamFrame * minPadSize ),
                                                  m_rules->mlMaxCreamFrame ) );