diff --git a/devel/avra/Makefile b/devel/avra/Makefile
index deb96e424b52..bbbc267a8d76 100644
--- a/devel/avra/Makefile
+++ b/devel/avra/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	avra
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	devel
 MASTER_SITES=	SF
@@ -15,13 +14,14 @@ MASTER_SITES=	SF
 MAINTAINER=	wes@FreeBSD.org
 COMMENT=	Macro Assembler for Atmel AVR microcontrollers
 
-USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}
-BUILD_WRKSRC=	${WRKSRC}/SOURCE
-INSTALL_WRKSRC=	${WRKSRC}/SOURCE
+USE_AUTOTOOLS=	aclocal:110 autoconf:262 automake:110
+AUTOMAKE_ARGS=	-a
 
 PORTDOCS=	README
 
+# Install the Avra README file as docs
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/devel/avra/distinfo b/devel/avra/distinfo
index cc4e90cfbed3..ef09c2d46491 100644
--- a/devel/avra/distinfo
+++ b/devel/avra/distinfo
@@ -1,3 +1,3 @@
-MD5 (avra-1.0.1-src.tar.gz) = 002a810e12d6b64f0079a7508a5b8066
-SHA256 (avra-1.0.1-src.tar.gz) = b79776cc1e413bac902ed08208df02cded1c4ec0b6bc7250468ba6ee41e77468
-SIZE (avra-1.0.1-src.tar.gz) = 90993
+MD5 (avra-1.2.1-src.tar.gz) = f0fec894fe86097297a43469de59162e
+SHA256 (avra-1.2.1-src.tar.gz) = fe22468ec74ffbd97dcac4de8ba7291dcebd0fcca72baf085746e1930de5c09f
+SIZE (avra-1.2.1-src.tar.gz) = 108243
diff --git a/devel/avra/files/patch-SOURCE-Makefile b/devel/avra/files/patch-SOURCE-Makefile
deleted file mode 100644
index b5c06d58e38a..000000000000
--- a/devel/avra/files/patch-SOURCE-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- SOURCE/Makefile.orig	Thu Jun 10 15:21:52 2004
-+++ SOURCE/Makefile	Fri Oct 28 21:02:00 2005
-@@ -19,6 +19,8 @@
- 
- BINFILES = avra README ChangeLog COPYING avra.1 avra.txt
- 
-+PREFIX ?= /usr/local
-+
- VERSION = 1.0.0
- 
- #********************************************************************
-@@ -26,9 +28,9 @@
- all: avra
- 
- install: avra
--	cp avra /usr/local/bin
--	cp avra.1 /usr/local/man/man1
--	chmod +r /usr/local/man/man1/avra.1
-+	cp avra $(PREFIX)/bin
-+#	cp avra.1 $(PREFIX)/man/man1
-+#	chmod +r $(PREFIX)/man/man1/avra.1
- 
- clean:
- 	rm -f avra *.o *.p *~ avra.exe
diff --git a/devel/avra/files/patch-SOURCE-expr.c b/devel/avra/files/patch-SOURCE-expr.c
deleted file mode 100644
index edffbedca9fc..000000000000
--- a/devel/avra/files/patch-SOURCE-expr.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- SOURCE/expr.c.orig	Thu Jun 10 21:01:40 2004
-+++ SOURCE/expr.c	Mon Feb 14 21:30:15 2005
-@@ -241,7 +241,7 @@
- }
- 
- 
--int log2(int value)
-+int do_log2(int value)
- {
- 	int i = 0;
- 
-@@ -271,7 +271,7 @@
- 		case FUNCTION_EXP2:
- 			return(1 << value);
- 		case FUNCTION_LOG2:
--			return(log2(value));
-+			return(do_log2(value));
- 		default:
- 			return(0);
- 	}
diff --git a/devel/avra/pkg-plist b/devel/avra/pkg-plist
index af07e42003b0..ecead8950a5b 100644
--- a/devel/avra/pkg-plist
+++ b/devel/avra/pkg-plist
@@ -1 +1,3 @@
 bin/avra
+share/nls/POSIX
+share/nls/en_US.US-ASCII