diff --git a/devel/avra/Makefile b/devel/avra/Makefile
index d8a652b47aab..880972b031b8 100644
--- a/devel/avra/Makefile
+++ b/devel/avra/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	avra
-PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTVERSION=	1.4.1
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Macro Assembler for Atmel AVR microcontrollers
@@ -13,27 +11,26 @@ COMMENT=	Macro Assembler for Atmel AVR microcontrollers
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake tar:bzip2
-MAKEFILE=	${BUILD_WRKSRC}/makefiles/Makefile.linux
-MAKE_ARGS=	CC="${CC}" LD="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+USE_GITHUB=	yes
+GH_ACCOUNT=	hsoft
 
-BUILD_WRKSRC=	${WRKSRC}/src
+USES=		gmake
+MAKE_ENV=	TARGET_INCLUDE_PATH="${DATADIR}/includes"
+TEST_TARGET=	check
 
-PORTDOCS=	*
+PORTDOCS=	AUTHORS CHANGELOG.md README.md TODO USAGE.md
 PORTEXAMPLES=	*
 PORTDATA=	*
 PLIST_FILES=	bin/avra
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-do-install:
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/avra ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} includes ${STAGEDIR}${DATADIR})
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/avra
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/devel/avra/distinfo b/devel/avra/distinfo
index da6e99c9ae6b..a9eacd7ad189 100644
--- a/devel/avra/distinfo
+++ b/devel/avra/distinfo
@@ -1,2 +1,3 @@
-SHA256 (avra-1.3.0.tar.bz2) = a62cbf8662caf9cc4e75da6c634efce402778639202a65eb2d149002c1049712
-SIZE (avra-1.3.0.tar.bz2) = 314903
+TIMESTAMP = 1574960402
+SHA256 (hsoft-avra-1.4.1_GH0.tar.gz) = 0b92f3a2709d72b903fd95afee2c985ed3847440ad12cd651738afffa14ec69e
+SIZE (hsoft-avra-1.4.1_GH0.tar.gz) = 386055
diff --git a/devel/avra/files/patch-Makefile b/devel/avra/files/patch-Makefile
new file mode 100644
index 000000000000..9b73e3cc1d14
--- /dev/null
+++ b/devel/avra/files/patch-Makefile
@@ -0,0 +1,13 @@
+--- Makefile.orig	2019-04-24 20:15:58 UTC
++++ Makefile
+@@ -11,8 +11,8 @@ DISTFILES = src \
+ 	COPYING \
+ 	Makefile \
+ 
+-PREFIX = /usr/local
+-TARGET_INCLUDE_PATH = $(PREFIX)/include/avr
++PREFIX ?= /usr/local
++TARGET_INCLUDE_PATH ?= $(PREFIX)/include/avr
+ 
+ CDEFS = -DDEFAULT_INCLUDE_PATH='"$(TARGET_INCLUDE_PATH)"' \
+ 	-DVERSION='"$(VERSION)"'
diff --git a/devel/avra/files/patch-src_makefiles_Makefile.linux b/devel/avra/files/patch-src_makefiles_Makefile.linux
new file mode 100644
index 000000000000..a785f743e9fb
--- /dev/null
+++ b/devel/avra/files/patch-src_makefiles_Makefile.linux
@@ -0,0 +1,23 @@
+--- src/makefiles/Makefile.linux.orig	2019-04-24 20:15:58 UTC
++++ src/makefiles/Makefile.linux
+@@ -1,7 +1,7 @@
+-CC = gcc
+-LD = gcc -static
+-CFLAGS = -Wall -O3 $(CDEFS)
+-LDFLAGS = -s
++CC ?= gcc
++CFLAGS ?= -Wall -O3
++CFLAGS += $(CDEFS)
++LDFLAGS ?= -s
+ 
+ SOURCES = avra.c \
+ 	device.c \
+@@ -19,7 +19,7 @@ SOURCES = avra.c \
+ OBJECTS = $(SOURCES:.c=.o)
+ 
+ avra: $(OBJECTS)
+-	$(LD) -o $@ $(OBJECTS) $(LDFLAGS)
++	$(CC) -o $@ $(OBJECTS) $(LDFLAGS)
+ 
+ clean:
+ 	rm -f avra *.o *.p *~
diff --git a/devel/avra/files/patch-tests_regression_runtests.sh b/devel/avra/files/patch-tests_regression_runtests.sh
new file mode 100644
index 000000000000..53537cfd002f
--- /dev/null
+++ b/devel/avra/files/patch-tests_regression_runtests.sh
@@ -0,0 +1,8 @@
+--- tests/regression/runtests.sh.orig	2019-04-24 20:15:58 UTC
++++ tests/regression/runtests.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ AVRA_BIN="../../src/avra"
+ 
diff --git a/devel/avra/pkg-descr b/devel/avra/pkg-descr
index 1ef27e77cf1c..a90fd7ae14ad 100644
--- a/devel/avra/pkg-descr
+++ b/devel/avra/pkg-descr
@@ -1,4 +1,4 @@
 avra is an GNU GPL'ed assembler for the Atmel AVR microcontrollers.
 See the file COPYING for more information regarding the license.
 
-WWW: http://avra.sourceforge.net/
+WWW: https://github.com/hsoft/avra