diff --git a/devel/arduino-irremote/Makefile b/devel/arduino-irremote/Makefile
index c7605ceb535a..dd51c0aa0a36 100644
--- a/devel/arduino-irremote/Makefile
+++ b/devel/arduino-irremote/Makefile
@@ -2,11 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	arduino-irremote
-PORTVERSION=	0.1
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	devel
-MASTER_SITES=	http://files.arcfn.com/files/
-DISTNAME=	IRremote
 
 MAINTAINER=	leres@ee.lbl.gov
 COMMENT=	Multi-protocol infrared remote library for the Arduino
@@ -15,23 +12,30 @@ LICENSE=	LGPL21
 
 RUN_DEPENDS=	arduino:devel/arduino
 
-WRKSRC=		${WRKDIR}/IRremote
-USES=		zip dos2unix
+USES=		dos2unix
+USE_GITHUB=	yes
+GH_ACCOUNT=	z3t0
+GH_PROJECT=	Arduino-IRremote
+GH_TAGNAME=	2.1.0
 
 NO_BUILD=	yes
 
-PLIST_FILES=	arduino/libraries/IRremote/IRremote.cpp \
-		arduino/libraries/IRremote/IRremote.h \
-		arduino/libraries/IRremote/IRremoteInt.h \
-		arduino/libraries/IRremote/keywords.txt
+FILES=		IRremote.cpp IRremote.h IRremoteInt.h irPronto.cpp \
+		irRecv.cpp irSend.cpp ir_Aiwa.cpp ir_Denon.cpp \
+		ir_Dish.cpp ir_JVC.cpp ir_LG.cpp ir_Mitsubishi.cpp \
+		ir_NEC.cpp ir_Panasonic.cpp ir_RC5_RC6.cpp \
+		ir_Samsung.cpp ir_Sanyo.cpp ir_Sharp.cpp ir_Sony.cpp \
+		ir_Template.cpp ir_Whynter.cpp keywords.txt \
+
+PLIST_FILES=	${FILES:S,^,arduino/libraries/IRremote/,}
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	EXAMPLES
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/arduino/libraries/IRremote
-	(cd ${WRKSRC} && ${INSTALL_DATA} IRremote.cpp IRremote.h IRremoteInt.h \
-		keywords.txt ${STAGEDIR}${PREFIX}/arduino/libraries/IRremote)
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} \
+		${STAGEDIR}${PREFIX}/arduino/libraries/IRremote)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
diff --git a/devel/arduino-irremote/distinfo b/devel/arduino-irremote/distinfo
index 39a091e2c027..87ec67cb261f 100644
--- a/devel/arduino-irremote/distinfo
+++ b/devel/arduino-irremote/distinfo
@@ -1,2 +1,3 @@
-SHA256 (IRremote.zip) = 2eff9847285330796b1fc8bf007f4a2f16dea7546ba1fcbaef1592a2235a60d4
-SIZE (IRremote.zip) = 23732
+TIMESTAMP = 1465001274
+SHA256 (z3t0-Arduino-IRremote-2.1.0_GH0.tar.gz) = 4cd26f5037590e99b3d065f17c4327542625a986fe421e25288209e713aece5b
+SIZE (z3t0-Arduino-IRremote-2.1.0_GH0.tar.gz) = 50373
diff --git a/devel/arduino-irremote/files/patch-IRremoteInt.h b/devel/arduino-irremote/files/patch-IRremoteInt.h
deleted file mode 100644
index fb63b9637227..000000000000
--- a/devel/arduino-irremote/files/patch-IRremoteInt.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- IRremoteInt.h.orig	2009-09-05 23:55:48.000000000 -0700
-+++ IRremoteInt.h	2011-12-27 15:40:59.000000000 -0800
-@@ -12,12 +12,16 @@
- #ifndef IRremoteint_h
- #define IRremoteint_h
- 
-+#if defined(ARDUINO) && ARDUINO >= 100
-+#include <Arduino.h>
-+#else
- #include <WProgram.h>
-+#endif
- 
- #define CLKFUDGE 5      // fudge factor for clock interrupt overhead
- #define CLK 256      // max value for clock (timer 2)
- #define PRESCALE 8      // timer2 clock prescale
--#define SYSCLOCK 16000000  // main Arduino clock
-+#define SYSCLOCK F_CPU  // main Arduino clock
- #define CLKSPERUSEC (SYSCLOCK/PRESCALE/1000000)   // timer clocks per microsecond
- 
- #define ERR 0
diff --git a/devel/arduino-irremote/pkg-descr b/devel/arduino-irremote/pkg-descr
index 6204a36dee99..4404f9926042 100644
--- a/devel/arduino-irremote/pkg-descr
+++ b/devel/arduino-irremote/pkg-descr
@@ -1,7 +1,7 @@
-A Multi-Protocol Infrared Remote Library for the Arduino
+Infrared remote library for Arduino: send and receive infrared
+signals with multiple protocols
 
-This IR remote library, written by Ken Shirriff, lets you both send
-and receive IR remote codes in multiple protocols. It supports NEC,
-Sony SIRC, Philips RC5, Philips RC6, and raw protocols.
+This library enables you to send and receive using infra-red signals
+on an Arduino.
 
-WWW: http://www.arcfn.com/2009/08/multi-protocol-infrared-remote-library.html
+WWW: http://z3t0.github.io/Arduino-IRremote/