diff --git a/lang/sdcc-devel/Makefile b/lang/sdcc-devel/Makefile
index 5a65024db29c..5f6211b774d0 100644
--- a/lang/sdcc-devel/Makefile
+++ b/lang/sdcc-devel/Makefile
@@ -1,13 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	sdcc
-PORTVERSION=	3.5.5.2015.11.06
-PORTREVISION=	1
+PORTVERSION=	3.5.5.2016.02.20
 CATEGORIES=	lang
 MASTER_SITES=	SF/sdcc/snapshot_builds/sdcc-src/ \
 		http://tijl.fastmail.com/mirror/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-src-20151106-9386
+DISTNAME=	${PORTNAME}-src-20160220-9506
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Small Device C Compiler
@@ -35,11 +34,9 @@ Z80_DESC=	Zilog Z80/Z180/GBZ80, Rabbit 2000/3000, Toshiba TLCS-90
 
 CONFIGURE_ARGS=	--disable-avr --disable-install-libbfd --disable-werror \
 		--disable-st7 docdir=${DOCSDIR} sdcc_cv_c_fms_extensions=no
-NOPRECIOUSMAKEVARS=	yes
 PORTDATA=	*
 PORTDOCS=	*
 WRKSRC=		${WRKDIR}/sdcc
-MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_SUB=		yes
 DEVLIB_CONFIGURE_OFF=	--disable-device-lib
@@ -69,6 +66,27 @@ post-patch:
 		${WRKSRC}/support/sdbinutils/libiberty/Makefile.in
 	@${REINPLACE_CMD} '/^SUBDIRS =/s/doc//' \
 		${WRKSRC}/support/sdbinutils/bfd/Makefile.in
+	@${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/PICARCH/g' \
+		${WRKSRC}/device/lib/pic14/Makefile.common \
+		${WRKSRC}/device/lib/pic14/Makefile.in \
+		${WRKSRC}/device/lib/pic14/configure \
+		${WRKSRC}/device/lib/pic14/libm/Makefile.in \
+		${WRKSRC}/device/lib/pic14/libsdcc/enhanced/Makefile.in \
+		${WRKSRC}/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in \
+		${WRKSRC}/device/lib/pic14/libsdcc/regular/Makefile.in \
+		${WRKSRC}/device/lib/pic16/Makefile.in \
+		${WRKSRC}/device/lib/pic16/configure \
+		${WRKSRC}/device/lib/pic16/debug/Makefile.in \
+		${WRKSRC}/device/lib/pic16/libc/Makefile.in \
+		${WRKSRC}/device/lib/pic16/libio/Makefile.in \
+		${WRKSRC}/device/lib/pic16/libm/Makefile.in \
+		${WRKSRC}/device/lib/pic16/libsdcc/Makefile.in \
+		${WRKSRC}/device/lib/pic16/startup/Makefile.in \
+		${WRKSRC}/device/non-free/lib/pic14/Makefile.common.in \
+		${WRKSRC}/device/non-free/lib/pic14/Makefile.rules \
+		${WRKSRC}/device/non-free/lib/pic16/Makefile.in \
+		${WRKSRC}/device/non-free/lib/pic16/configure \
+		${WRKSRC}/device/non-free/lib/pic16/libdev/Makefile.in
 .if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} 's, [a-z-]*doc,,' \
 		${WRKSRC}/Makefile.in \
diff --git a/lang/sdcc-devel/distinfo b/lang/sdcc-devel/distinfo
index 53c2343c5496..7562450d8958 100644
--- a/lang/sdcc-devel/distinfo
+++ b/lang/sdcc-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sdcc-src-20151106-9386.tar.bz2) = 8e2cd0807e15045bcdef6ebcffdd85600116ff1834b41a86c7413cfbbc49029d
-SIZE (sdcc-src-20151106-9386.tar.bz2) = 14390037
+SHA256 (sdcc-src-20160220-9506.tar.bz2) = a5c47d85889ca062085dda28013f04f4125edd90e39c76077eeba057f339c729
+SIZE (sdcc-src-20160220-9506.tar.bz2) = 17935525
diff --git a/lang/sdcc-devel/files/patch-src_SDCClospre.hpp b/lang/sdcc-devel/files/patch-src_SDCClospre.hpp
deleted file mode 100644
index 34ac061d2d1c..000000000000
--- a/lang/sdcc-devel/files/patch-src_SDCClospre.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/SDCClospre.hpp.orig	2014-01-03 17:18:45 UTC
-+++ src/SDCClospre.hpp
-@@ -19,6 +19,12 @@
- //
- // Lifetime-optimal speculative partial redundancy elimination.
- 
-+// Workaround for boost bug #11880
-+#include <boost/version.hpp>
-+#if BOOST_VERSION == 106000
-+	#include <boost/type_traits/ice.hpp>
-+#endif
-+
- #include <boost/graph/graphviz.hpp>
- #include <boost/tuple/tuple.hpp>
- #include <boost/tuple/tuple_comparison.hpp>
diff --git a/lang/sdcc-devel/files/patch-src_SDCCnaddr.hpp b/lang/sdcc-devel/files/patch-src_SDCCnaddr.hpp
deleted file mode 100644
index 28b9fba53289..000000000000
--- a/lang/sdcc-devel/files/patch-src_SDCCnaddr.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/SDCCnaddr.hpp.orig	2015-04-01 13:50:35 UTC
-+++ src/SDCCnaddr.hpp
-@@ -37,6 +37,12 @@
- #include <sstream>
- #include <fstream>
- 
-+// Workaround for boost bug #11880
-+#include <boost/version.hpp>
-+#if BOOST_VERSION == 106000
-+	#include <boost/type_traits/ice.hpp>
-+#endif
-+
- #include <boost/graph/graphviz.hpp>
- 
- #include "SDCCtree_dec.hpp"
diff --git a/lang/sdcc-devel/files/patch-src_SDCCralloc.hpp b/lang/sdcc-devel/files/patch-src_SDCCralloc.hpp
deleted file mode 100644
index 5b09fe158be2..000000000000
--- a/lang/sdcc-devel/files/patch-src_SDCCralloc.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/SDCCralloc.hpp.orig	2015-02-25 10:25:50 UTC
-+++ src/SDCCralloc.hpp
-@@ -51,6 +51,12 @@
- #include <sstream>
- #include <fstream>
- 
-+// Workaround for boost bug #11880
-+#include <boost/version.hpp>
-+#if BOOST_VERSION == 106000
-+	#include <boost/type_traits/ice.hpp>
-+#endif
-+
- #include <boost/graph/graphviz.hpp>
- #include <boost/graph/adjacency_matrix.hpp>
- #include <boost/graph/connected_components.hpp>