diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile
index fa5498dd677be..63d7bc428abb1 100644
--- a/devel/astyle/Makefile
+++ b/devel/astyle/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2015/03/13 17:08:14 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2016/07/11 18:26:52 schmonz Exp $
 
-DISTNAME=	astyle_2.04_linux
+DISTNAME=	astyle_2.05.1_linux
 PKGNAME=	${DISTNAME:S/_linux//:S/_/-/}
 CATEGORIES=	textproc devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=astyle/}
diff --git a/devel/astyle/PLIST b/devel/astyle/PLIST
index 5e0b989769848..13e99c2e6cf6a 100644
--- a/devel/astyle/PLIST
+++ b/devel/astyle/PLIST
@@ -1,13 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2014/08/13 20:56:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/07/11 18:26:52 schmonz Exp $
 bin/astyle
 share/doc/html/astyle/astyle.html
-share/doc/html/astyle/index.html
 share/doc/html/astyle/install.html
 share/doc/html/astyle/license.html
-share/doc/html/astyle/links.html
 share/doc/html/astyle/news.html
 share/doc/html/astyle/notes.html
-share/doc/html/astyle/scripts.html
 share/doc/html/astyle/styles.css
-share/doc/html/astyle/subversion.html
-share/doc/html/astyle/vsinstall.html
diff --git a/devel/astyle/distinfo b/devel/astyle/distinfo
index ba3c3275f2638..9be97cea3f588 100644
--- a/devel/astyle/distinfo
+++ b/devel/astyle/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.14 2015/11/03 03:27:14 agc Exp $
+$NetBSD: distinfo,v 1.15 2016/07/11 18:26:52 schmonz Exp $
 
-SHA1 (astyle_2.04_linux.tar.gz) = 8d7701afa3ecb7fb24d3647d8b278dcf17f3ae3e
-RMD160 (astyle_2.04_linux.tar.gz) = 94d237759e5d2e4d45db5614ee091996f1a995f2
-SHA512 (astyle_2.04_linux.tar.gz) = bc0f6351fac4198ab969251342c4e453064b07512a2d06825a93c75daf86b06469c9971f35fbadad872d23368dc546019d8d174e07ceaad6e10007f562fdeffd
-Size (astyle_2.04_linux.tar.gz) = 156974 bytes
-SHA1 (patch-src_astyle__main.cpp) = be94921cda22bd0c2037625e0b127b93bbd8a598
+SHA1 (astyle_2.05.1_linux.tar.gz) = b2ccedbb49f7f892afd6a9a59a67b57c36c41df3
+RMD160 (astyle_2.05.1_linux.tar.gz) = fc3bc88bc18a6d7177f3e645fda7cc79c497a968
+SHA512 (astyle_2.05.1_linux.tar.gz) = 853bf84cb196f2300ca00fb7f18fe336764f1205ae0674a75c1a019bf734495d8fb3d9b6aca0ea258b6632921fb268906128c1afb80596532489749cd2cbe495
+Size (astyle_2.05.1_linux.tar.gz) = 152765 bytes
diff --git a/devel/astyle/patches/patch-src_astyle__main.cpp b/devel/astyle/patches/patch-src_astyle__main.cpp
deleted file mode 100644
index ed967876da111..0000000000000
--- a/devel/astyle/patches/patch-src_astyle__main.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_astyle__main.cpp,v 1.2 2014/08/13 21:11:07 wiz Exp $
-
-Fix build on NetBSD.
-https://sourceforge.net/p/astyle/bugs/299/
-
---- src/astyle_main.cpp.orig	2013-11-01 20:31:48.000000000 +0000
-+++ src/astyle_main.cpp
-@@ -2671,7 +2671,11 @@ utf16_t* ASLibrary::convertUtf8ToUtf16(c
- 	size_t inLeft = strlen(utf8In) + 1;		// converts the ending NULL
- 	char* utf16Conv = reinterpret_cast<char*>(utf16Out);
- 	size_t outLeft = utf16Len;
-+#ifdef __NetBSD__
-+	size_t iconvval = iconv(iconvh, (const char **)&utf8Conv, &inLeft, &utf16Conv, &outLeft);
-+#else
- 	size_t iconvval = iconv(iconvh, &utf8Conv, &inLeft, &utf16Conv, &outLeft);
-+#endif
- 	///////////////////////////////////////////////////////
- 	bool showStats = false;
- 	if (showStats && (inLeft != 0 || outLeft != 0))
-@@ -2713,7 +2717,11 @@ char* ASLibrary::convertUtf16ToUtf8(cons
- 	size_t inLeft = (utf16len(utf16In) + 1) * sizeof(utf16_t);	// converts the ending NULL
- 	char* utf8Conv = utf8Out;
- 	size_t outLeft = utf8Len;
-+#ifdef __NetBSD__
-+	size_t iconvval = iconv(iconvh, (const char **)&utf16Conv, &inLeft, &utf8Conv, &outLeft);
-+#else
- 	size_t iconvval = iconv(iconvh, &utf16Conv, &inLeft, &utf8Conv, &outLeft);
-+#endif
- 	///////////////////////////////////////////////////////
- 	bool showStats = false;
- 	if (showStats && (inLeft != 0 || outLeft != 0))