--- a/python/ppci/target/msp430/msp430.py	Fri Apr 18 13:08:45 2014 +0200
+++ b/python/ppci/target/msp430/msp430.py	Sat Apr 26 17:41:56 2014 +0200
@@ -4,9 +4,17 @@
 from ppci import CompilerError
 from .registers import r10, r11, r12, r13, r14, r15
 from .instructions import Reti, Mov, Add
+from ...assembler import BaseAssembler
+
 
 # Create the target class (singleton):
 
+class Msp430Assembler(BaseAssembler):
+    def __init__(self, target):
+        super().__init__(target)
+        self.make_parser()
+
+
 class Msp430Target(Target):
     def __init__(self):
         super().__init__('msp430')
@@ -39,6 +47,7 @@
         self.add_keyword('reti')
         self.add_instruction(['reti'], lambda rhs: Reti())
 
+        self.assembler = Msp430Assembler(self)
 
 
 msp430target = Msp430Target()