diff --git a/Ghidra/Processors/TI_MSP430/data/languages/TI_MSP430.cspec b/Ghidra/Processors/TI_MSP430/data/languages/TI_MSP430.cspec
index 5f5bf8fe84..389ea2686d 100644
--- a/Ghidra/Processors/TI_MSP430/data/languages/TI_MSP430.cspec
+++ b/Ghidra/Processors/TI_MSP430/data/languages/TI_MSP430.cspec
@@ -2,23 +2,23 @@
 <!--Information from "MSP430 Embedded Application Binary Interface Rev A -->
 <compiler_spec>
  <data_organization>
-     <machine_alignment value="2" />
-     <default_alignment value="1" />
-     <default_pointer_alignment value="2" />
-     <pointer_size value="2" />
-     <short_size value="2" />
-     <integer_size value="2" />
-     <wchar_size value="2" />
-     <long_size value="4" />
-     <long_long_size value="8" />
-     <float_size value="4" />
-     <double_size value="8" />
-     <long_double_size value="8" /> 
+     <machine_alignment value="2"/>
+     <default_alignment value="1"/>
+     <default_pointer_alignment value="2"/>
+     <pointer_size value="2"/>
+     <short_size value="2"/>
+     <integer_size value="2"/>
+     <wchar_size value="2"/>
+     <long_size value="4"/>
+     <long_long_size value="8"/>
+     <float_size value="4"/>
+     <double_size value="8"/>
+     <long_double_size value="8"/> 
      <size_alignment_map>
-          <entry size="1" alignment="1" />
-          <entry size="2" alignment="2" />
-          <entry size="4" alignment="2" />
-          <entry size="8" alignment="2" />
+          <entry size="1" alignment="1"/>
+          <entry size="2" alignment="2"/>
+          <entry size="4" alignment="2"/>
+          <entry size="8" alignment="2"/>
      </size_alignment_map>
   </data_organization>
   <global>
@@ -40,23 +40,43 @@
         <pentry maxsize="2" minsize="1">
           <register name="R15"/>
         </pentry>
-        <pentry maxsize="500" minsize="1" align="2">
+        <pentry maxsize="500" minsize="1" align="1">
           <addr space="stack" offset="2"/>
         </pentry>
+        <rule>
+          <datatype name="struct" minsize="1"/>
+          <convert_to_ptr/>
+        </rule>
+        <rule>
+          <datatype name="any" maxsize="4"/>
+          <join stackspill="true"/>		
+        </rule>
+        <rule>
+          <datatype name="any" minsize="5" maxsize="8"/>
+          <join stackspill="false"/>		
+        </rule>
 	</input>
 	<output>
         <pentry minsize="1" maxsize="2">
           <register name="R12"/>
         </pentry>
-        <pentry minsize="3" maxsize="4">
-          <addr space="join" piece1="R13" piece2="R12"/>
+        <pentry minsize="1" maxsize="2">
+          <register name="R13"/>
         </pentry>
-        <pentry minsize="5" maxsize="6">
-          <addr space="join" piece1="R14" piece2="R13" piece3="R12"/>
+        <pentry minsize="1" maxsize="2">
+          <register name="R14"/>
         </pentry>
-        <pentry minsize="7" maxsize="8">
-          <addr space="join" piece1="R15" piece2="R14" piece3="R13" piece4="R12"/>
+        <pentry minsize="1" maxsize="2">
+          <register name="R15"/>
         </pentry>
+        <rule>
+          <datatype name="struct"/>
+          <hidden_return/>
+        </rule>
+        <rule>
+          <datatype name="any" maxsize="8"/>
+          <join/>
+        </rule>
 	</output>
 	<unaffected>
           <register name="SP"/>