diff -Nru msp430mcu-20110613/debian/changelog msp430mcu-20110613/debian/changelog
--- msp430mcu-20110613/debian/changelog	2011-06-13 07:59:58.000000000 +0000
+++ msp430mcu-20110613/debian/changelog	2011-09-01 12:48:15.000000000 +0000
@@ -1,3 +1,18 @@
+msp430mcu (20110613-3) unstable; urgency=low
+
+  * Upstream patch-point
+    + SF 3400714: __delay_cycles missing from in430.h 
+
+ -- Luca Bruno <lucab@debian.org>  Thu, 01 Sep 2011 14:46:46 +0200
+
+msp430mcu (20110613-2) unstable; urgency=low
+
+  * Upstream patch-point
+    + SF 3379189: Wrong permission on installed files
+    + SF 3384550: Missing __ASSEMBLER__ guard in msp430.h 
+
+ -- Luca Bruno <lucab@debian.org>  Tue, 16 Aug 2011 20:05:51 +0200
+
 msp430mcu (20110613-1) unstable; urgency=low
 
   * New upstream release
diff -Nru msp430mcu-20110613/debian/patches/fix-perm.diff msp430mcu-20110613/debian/patches/fix-perm.diff
--- msp430mcu-20110613/debian/patches/fix-perm.diff	2011-06-13 08:21:23.000000000 +0000
+++ msp430mcu-20110613/debian/patches/fix-perm.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-Index: msp430mcu-20110613/scripts/install.sh
-===================================================================
---- msp430mcu-20110613.orig/scripts/install.sh	2011-06-13 10:20:23.696239090 +0200
-+++ msp430mcu-20110613/scripts/install.sh	2011-06-13 10:21:20.412239076 +0200
-@@ -13,18 +13,19 @@
- LIBPATH=${PREFIX}/msp430/lib
- 
- mkdir -p ${INCPATH} ${LIBPATH}
-+PERM=0644
- 
- # Upstream headers
--install -p ${UPSTREAM}/*.h ${INCPATH}
-+install -m ${PERM} -p ${UPSTREAM}/*.h ${INCPATH}
- 
- # Local override headers
--install -p ${MSP430MCU_ROOT}/include/*.h ${INCPATH}
-+install -m ${PERM} -p ${MSP430MCU_ROOT}/include/*.h ${INCPATH}
- 
- # Override msp430.h to accommodate legacy MSPGCC MCU identifiers
--install -p ${ANALYSIS}/msp430.h ${INCPATH}
-+install -m ${PERM} -p ${ANALYSIS}/msp430.h ${INCPATH}
- 
- # MCU-specific data for GCC driver program
--install -p ${ANALYSIS}/msp430mcu.spec ${LIBPATH}
-+install -m ${PERM} -p ${ANALYSIS}/msp430mcu.spec ${LIBPATH}
- 
- # Install MCU-specific memory and periph maps
- cp -pr ${ANALYSIS}/ldscripts ${LIBPATH}
diff -Nru msp430mcu-20110613/debian/patches/msp430mcu-20110613-sf3379189.patch msp430mcu-20110613/debian/patches/msp430mcu-20110613-sf3379189.patch
--- msp430mcu-20110613/debian/patches/msp430mcu-20110613-sf3379189.patch	1970-01-01 00:00:00.000000000 +0000
+++ msp430mcu-20110613/debian/patches/msp430mcu-20110613-sf3379189.patch	2011-08-16 18:03:25.000000000 +0000
@@ -0,0 +1,38 @@
+From 39f159ec20d942d9a1ca897adc6ace757ee95121 Mon Sep 17 00:00:00 2001
+From: "Peter A. Bigot" <pabigot@users.sourceforge.net>
+Date: Wed, 27 Jul 2011 10:09:34 -0500
+Subject: [PATCH] SF 3379189: Wrong permission on installed files
+
+---
+ scripts/install.sh |    9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/scripts/install.sh b/scripts/install.sh
+index 3d71e63..dfce335 100755
+--- a/scripts/install.sh
++++ b/scripts/install.sh
+@@ -15,16 +15,17 @@ LIBPATH=${PREFIX}/msp430/lib
+ mkdir -p ${INCPATH} ${LIBPATH}
+ 
+ # Upstream headers
+-install -p ${UPSTREAM}/*.h ${INCPATH}
++install -p -m 0644 ${UPSTREAM}/*.h ${INCPATH}
+ 
+ # Local override headers
+-install -p ${MSP430MCU_ROOT}/include/*.h ${INCPATH}
++install -p -m 0644 ${MSP430MCU_ROOT}/include/*.h ${INCPATH}
+ 
+ # Override msp430.h to accommodate legacy MSPGCC MCU identifiers
+-install -p ${ANALYSIS}/msp430.h ${INCPATH}
++install -p -m 0644 ${ANALYSIS}/msp430.h ${INCPATH}
+ 
+ # MCU-specific data for GCC driver program
+-install -p ${ANALYSIS}/msp430mcu.spec ${LIBPATH}
++install -p -m 0644 ${ANALYSIS}/msp430mcu.spec ${LIBPATH}
+ 
+ # Install MCU-specific memory and periph maps
+ cp -pr ${ANALYSIS}/ldscripts ${LIBPATH}
++chmod -R og+rX ${LIBPATH}/ldscripts
+-- 
+1.7.6
+
diff -Nru msp430mcu-20110613/debian/patches/msp430mcu-20110613-sf3384550.patch msp430mcu-20110613/debian/patches/msp430mcu-20110613-sf3384550.patch
--- msp430mcu-20110613/debian/patches/msp430mcu-20110613-sf3384550.patch	1970-01-01 00:00:00.000000000 +0000
+++ msp430mcu-20110613/debian/patches/msp430mcu-20110613-sf3384550.patch	2011-08-16 18:03:25.000000000 +0000
@@ -0,0 +1,123 @@
+From ba88b633f8fc8ba153299fd4441ea7735eea2e62 Mon Sep 17 00:00:00 2001
+From: "Peter A. Bigot" <pabigot@users.sourceforge.net>
+Date: Tue, 2 Aug 2011 08:35:39 -0500
+Subject: [PATCH] SF 3384550 Missing __ASSEMBLER__ guard in msp430.h
+ (LTS/20110716)
+
+Add guard, also add constant values in assembler syntax.
+---
+ analysis/msp430.h   |   34 +++++++++++++++++++++++++++++-----
+ scripts/checkdev.py |   34 +++++++++++++++++++++++++++++-----
+ 2 files changed, 58 insertions(+), 10 deletions(-)
+
+diff --git a/analysis/msp430.h b/analysis/msp430.h
+index 2599631..d7b31ba 100644
+--- a/analysis/msp430.h
++++ b/analysis/msp430.h
+@@ -17,6 +17,8 @@
+ /** Date of msp430mcu package release */
+ #define __MSP430MCU__ 20110612
+ 
++#if !defined(__ASSEMBLER__)
++
+ /** Bit-markers for type of CPU present.
+  * Check equality against __MSP430_CPU__. */
+ typedef enum msp430_cpu_e
+@@ -32,13 +34,35 @@ typedef enum msp430_cpu_e
+ typedef enum msp430_mpy_e
+ {
+   MSP430_MPY_NONE = 0x0000,
+-  MSP430_MPY_16 = 0x0010,
+-  MSP430_MPY_16SE = 0x0011,
+-  MSP430_MPY_32 = 0x0020,
+-  MSP430_MPY_32DW = 0x0022,
+-  MSP430_MPY = 0x0030
++  MSP430_MPY_TYPE_16 = 0x0010,
++  MSP430_MPY_TYPE_32 = 0x0020,
++  MSP430_MPY_TYPE_ANY = 0x0030,
++  MSP430_MPY_HAS_SE = 0x0001,
++  MSP430_MPY_HAS_DW = 0x0002,
++  MSP430_MPY_16 = MSP430_MPY_TYPE_16,
++  MSP430_MPY_16SE = MSP430_MPY_16 | MSP430_MPY_HAS_SE,
++  MSP430_MPY_32 = MSP430_MPY_TYPE_32 | MSP430_MPY_HAS_SE,
++  MSP430_MPY_32DW = MSP430_MPY_32 | MSP430_MPY_HAS_DW,
+ } msp430_mpy_e;
+ 
++#else /* __ASSEMBLER__ */
++
++MSP430_CPU_MSP430 = 0x0000
++MSP430_CPU_MSP430X = 0x0002
++MSP430_CPU_MSP430XV2 = 0x0003
++MSP430_CPU = 0x0003
++MSP430_MPY_NONE = 0x0000
++MSP430_MPY_TYPE_16 = 0x0010
++MSP430_MPY_TYPE_32 = 0x0020
++MSP430_MPY_TYPE_ANY = 0x0030
++MSP430_MPY_HAS_SE = 0x0001
++MSP430_MPY_HAS_DW = 0x0002
++MSP430_MPY_16 = MSP430_MPY_TYPE_16
++MSP430_MPY_16SE = MSP430_MPY_16 | MSP430_MPY_HAS_SE
++MSP430_MPY_32 = MSP430_MPY_TYPE_32 | MSP430_MPY_HAS_SE
++MSP430_MPY_32DW = MSP430_MPY_32 | MSP430_MPY_HAS_DW
++
++#endif /* __ASSEMBLER__ */
+ 
+ #if defined(__CC430_5133__) || defined(__CC430X5133__) || defined(__CC430F5133__)
+ #include <cc430f5133.h>
+diff --git a/scripts/checkdev.py b/scripts/checkdev.py
+index 13c8db9..ad7a217 100644
+--- a/scripts/checkdev.py
++++ b/scripts/checkdev.py
+@@ -223,6 +223,8 @@ iof.write("""/* Map MCU preprocessor definitions to chip-specific include files.
+ /** Date of msp430mcu package release */
+ #define __MSP430MCU__ %(release_version)s
+ 
++#if !defined(__ASSEMBLER__)
++
+ /** Bit-markers for type of CPU present.
+  * Check equality against __MSP430_CPU__. */
+ typedef enum msp430_cpu_e
+@@ -238,13 +240,35 @@ typedef enum msp430_cpu_e
+ typedef enum msp430_mpy_e
+ {
+   MSP430_MPY_NONE = 0x0000,
+-  MSP430_MPY_16 = 0x0010,
+-  MSP430_MPY_16SE = 0x0011,
+-  MSP430_MPY_32 = 0x0020,
+-  MSP430_MPY_32DW = 0x0022,
+-  MSP430_MPY = 0x0030
++  MSP430_MPY_TYPE_16 = 0x0010,
++  MSP430_MPY_TYPE_32 = 0x0020,
++  MSP430_MPY_TYPE_ANY = 0x0030,
++  MSP430_MPY_HAS_SE = 0x0001,
++  MSP430_MPY_HAS_DW = 0x0002,
++  MSP430_MPY_16 = MSP430_MPY_TYPE_16,
++  MSP430_MPY_16SE = MSP430_MPY_16 | MSP430_MPY_HAS_SE,
++  MSP430_MPY_32 = MSP430_MPY_TYPE_32 | MSP430_MPY_HAS_SE,
++  MSP430_MPY_32DW = MSP430_MPY_32 | MSP430_MPY_HAS_DW,
+ } msp430_mpy_e;
+ 
++#else /* __ASSEMBLER__ */
++
++MSP430_CPU_MSP430 = 0x0000
++MSP430_CPU_MSP430X = 0x0002
++MSP430_CPU_MSP430XV2 = 0x0003
++MSP430_CPU = 0x0003
++MSP430_MPY_NONE = 0x0000
++MSP430_MPY_TYPE_16 = 0x0010
++MSP430_MPY_TYPE_32 = 0x0020
++MSP430_MPY_TYPE_ANY = 0x0030
++MSP430_MPY_HAS_SE = 0x0001
++MSP430_MPY_HAS_DW = 0x0002
++MSP430_MPY_16 = MSP430_MPY_TYPE_16
++MSP430_MPY_16SE = MSP430_MPY_16 | MSP430_MPY_HAS_SE
++MSP430_MPY_32 = MSP430_MPY_TYPE_32 | MSP430_MPY_HAS_SE
++MSP430_MPY_32DW = MSP430_MPY_32 | MSP430_MPY_HAS_DW
++
++#endif /* __ASSEMBLER__ */
+ """ % {
+         'upstream_version': file(os.path.join(upstream_dir, '.version')).readline().strip(),
+         'release_version': file(os.path.join(msp430mcu_root, '.version')).readline().strip() })
+-- 
+1.7.6
+
diff -Nru msp430mcu-20110613/debian/patches/msp430mcu-20110613-sf3400714.patch msp430mcu-20110613/debian/patches/msp430mcu-20110613-sf3400714.patch
--- msp430mcu-20110613/debian/patches/msp430mcu-20110613-sf3400714.patch	1970-01-01 00:00:00.000000000 +0000
+++ msp430mcu-20110613/debian/patches/msp430mcu-20110613-sf3400714.patch	2011-09-01 12:47:46.000000000 +0000
@@ -0,0 +1,29 @@
+From fde2ae35441c3623a1e27b85a864223acf7db848 Mon Sep 17 00:00:00 2001
+From: "Peter A. Bigot" <pabigot@users.sourceforge.net>
+Date: Tue, 30 Aug 2011 07:52:29 -0500
+Subject: [PATCH] SF 3400714 __delay_cycles missing from in430.h
+
+---
+ include/in430.h |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/include/in430.h b/include/in430.h
+index 7cd8a4a..0a417f2 100644
+--- a/include/in430.h
++++ b/include/in430.h
+@@ -84,6 +84,12 @@ void *__builtin_frame_address (int zero);
+  * depth; for non-zero values, null is returned */
+ void *__builtin_return_address (int zero);
+ 
++/* Generates code to spin in place for exactly the given number of
++ * machine cycles.  (Note: Prior to mspgcc 20110809, this was limited
++ * to roughly 198000 cycles.  Subsequent mspgcc releases support
++ * delays up to 2^31 cycles.) */
++void __delay_cycles (unsigned long int delay);
++
+ /* Legacy compatible names */
+ #define nop() __nop()
+ #define _NOP() __nop()
+-- 
+1.7.6
+
diff -Nru msp430mcu-20110613/debian/patches/series msp430mcu-20110613/debian/patches/series
--- msp430mcu-20110613/debian/patches/series	2011-06-13 08:20:18.000000000 +0000
+++ msp430mcu-20110613/debian/patches/series	2011-09-01 12:48:32.000000000 +0000
@@ -1,2 +1,3 @@
-
-fix-perm.diff
+msp430mcu-20110613-sf3379189.patch
+msp430mcu-20110613-sf3384550.patch
+msp430mcu-20110613-sf3400714.patch
diff -Nru msp430mcu-20110613/debian/rules msp430mcu-20110613/debian/rules
--- msp430mcu-20110613/debian/rules	2011-06-13 08:23:46.000000000 +0000
+++ msp430mcu-20110613/debian/rules	2011-09-01 12:45:51.000000000 +0000
@@ -7,7 +7,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp:
 	dh_testdir
 	touch build-stamp