diff --git a/devel/arm-elf/newlib/Makefile b/devel/arm-elf/newlib/Makefile
index 985b8a1b009..29f8bbe709f 100644
--- a/devel/arm-elf/newlib/Makefile
+++ b/devel/arm-elf/newlib/Makefile
@@ -1,20 +1,15 @@
-# $OpenBSD: Makefile,v 1.2 2007/09/16 02:52:57 merdely Exp $
+# $OpenBSD: Makefile,v 1.3 2010/10/22 15:20:53 jasper Exp $
 
 COMMENT=	newlib for arm-elf cross-development
 
-DISTNAME=	newlib-1.14.0
+DISTNAME=	newlib-1.18.0
 
 HOMEPAGE=	http://sourceware.org/newlib/
 
-# multiple copyrights, but basically bsd
-# see: /usr/local/share/doc/newlib
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-
 MASTER_SITES=	ftp://sources.redhat.com/pub/newlib/
 
+EXTRACT_SUFX=	.tar.gz
+
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	::devel/arm-elf/gcc
 
diff --git a/devel/arm-elf/newlib/distinfo b/devel/arm-elf/newlib/distinfo
index 300275fb799..a41725b219b 100644
--- a/devel/arm-elf/newlib/distinfo
+++ b/devel/arm-elf/newlib/distinfo
@@ -1,5 +1,5 @@
-MD5 (newlib-1.14.0.tar.gz) = P6Zj8TGzVdOtsk6tTfZ48g==
-RMD160 (newlib-1.14.0.tar.gz) = bys/MnWZJRQkId3AaSKe/4V90QY=
-SHA1 (newlib-1.14.0.tar.gz) = 7cUPXNpzS1DFQxorjR5Xmsgs4/k=
-SHA256 (newlib-1.14.0.tar.gz) = fbVWcRMsKUPbva36qVSRXCPbwykWhXWkK7lA70v1CiM=
-SIZE (newlib-1.14.0.tar.gz) = 7981432
+MD5 (newlib-1.18.0.tar.gz) = Pa4SfUqmWdcvjqjA/yp6IA==
+RMD160 (newlib-1.18.0.tar.gz) = adlv0yOiOFcHLzDLUYmQQAmYV80=
+SHA1 (newlib-1.18.0.tar.gz) = pH07ilCDBBQzNLNr21szeGphzpQ=
+SHA256 (newlib-1.18.0.tar.gz) = 1gjyKwsudyXS/KE8rBnzS8ZS2Xc6ytrneNuYgXRssHE=
+SIZE (newlib-1.18.0.tar.gz) = 13598301
diff --git a/devel/arm-elf/newlib/patches/patch-etc_Makefile_in b/devel/arm-elf/newlib/patches/patch-etc_Makefile_in
index 90851ed58c9..ef5a19aee66 100644
--- a/devel/arm-elf/newlib/patches/patch-etc_Makefile_in
+++ b/devel/arm-elf/newlib/patches/patch-etc_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-etc_Makefile_in,v 1.1.1.1 2007/04/02 15:35:02 sturm Exp $
---- etc/Makefile.in.orig	Sat Oct 14 19:33:40 2006
-+++ etc/Makefile.in	Sat Oct 14 19:33:58 2006
-@@ -48,7 +48,7 @@ TEXIDIR = $(srcdir)/../texinfo
+$OpenBSD: patch-etc_Makefile_in,v 1.2 2010/10/22 15:20:53 jasper Exp $
+--- etc/Makefile.in.orig	Fri Jul 31 00:44:48 2009
++++ etc/Makefile.in	Thu Oct 14 14:17:07 2010
+@@ -58,7 +58,7 @@ TEXIDIR = $(srcdir)/../texinfo
  #### Host, target, and site specific Makefile fragments come in here.
  ###
  
 -INFOFILES = standards.info configure.info
 +INFOFILES =
  DVIFILES = standards.dvi configure.dvi
- 
- all: info
+ PDFFILES = standards.pdf configure.pdf
+ HTMLFILES = standards.html configure.html
diff --git a/devel/arm-elf/newlib/pkg/PLIST b/devel/arm-elf/newlib/pkg/PLIST
index 94ffed232c1..ef6bc8bb06f 100644
--- a/devel/arm-elf/newlib/pkg/PLIST
+++ b/devel/arm-elf/newlib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/04/02 15:35:02 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2010/10/22 15:20:53 jasper Exp $
 arm-elf/include/
 arm-elf/include/_ansi.h
 arm-elf/include/_syslist.h
@@ -9,10 +9,14 @@ arm-elf/include/assert.h
 arm-elf/include/bits/
 arm-elf/include/ctype.h
 arm-elf/include/dirent.h
+arm-elf/include/envlock.h
 arm-elf/include/envz.h
 arm-elf/include/errno.h
 arm-elf/include/fastmath.h
 arm-elf/include/fcntl.h
+arm-elf/include/fnmatch.h
+arm-elf/include/getopt.h
+arm-elf/include/glob.h
 arm-elf/include/grp.h
 arm-elf/include/iconv.h
 arm-elf/include/ieeefp.h
@@ -22,6 +26,7 @@ arm-elf/include/libgen.h
 arm-elf/include/limits.h
 arm-elf/include/locale.h
 arm-elf/include/machine/
+arm-elf/include/machine/_default_types.h
 arm-elf/include/machine/_types.h
 arm-elf/include/machine/ansi.h
 arm-elf/include/machine/endian.h
@@ -44,6 +49,8 @@ arm-elf/include/pthread.h
 arm-elf/include/pwd.h
 arm-elf/include/reent.h
 arm-elf/include/regdef.h
+arm-elf/include/regex.h
+arm-elf/include/sched.h
 arm-elf/include/search.h
 arm-elf/include/setjmp.h
 arm-elf/include/signal.h
@@ -52,9 +59,11 @@ arm-elf/include/stdio.h
 arm-elf/include/stdlib.h
 arm-elf/include/string.h
 arm-elf/include/sys/
+arm-elf/include/sys/_default_fcntl.h
 arm-elf/include/sys/_types.h
 arm-elf/include/sys/cdefs.h
 arm-elf/include/sys/config.h
+arm-elf/include/sys/custom_file.h
 arm-elf/include/sys/dirent.h
 arm-elf/include/sys/errno.h
 arm-elf/include/sys/fcntl.h
@@ -79,6 +88,7 @@ arm-elf/include/sys/types.h
 arm-elf/include/sys/unistd.h
 arm-elf/include/sys/utime.h
 arm-elf/include/sys/wait.h
+arm-elf/include/tar.h
 arm-elf/include/termios.h
 arm-elf/include/time.h
 arm-elf/include/unctrl.h
@@ -87,16 +97,20 @@ arm-elf/include/utime.h
 arm-elf/include/utmp.h
 arm-elf/include/wchar.h
 arm-elf/include/wctype.h
+arm-elf/include/wordexp.h
 arm-elf/lib/crt0.o
 arm-elf/lib/interwork/
 arm-elf/lib/interwork/crt0.o
 arm-elf/lib/interwork/iq80310.specs
 arm-elf/lib/interwork/libc.a
 arm-elf/lib/interwork/libg.a
+arm-elf/lib/interwork/libgloss-linux.a
 arm-elf/lib/interwork/libm.a
 arm-elf/lib/interwork/libnosys.a
 arm-elf/lib/interwork/librdimon.a
 arm-elf/lib/interwork/librdpmon.a
+arm-elf/lib/interwork/linux-crt0.o
+arm-elf/lib/interwork/linux.specs
 arm-elf/lib/interwork/pid.specs
 arm-elf/lib/interwork/rdimon-crt0.o
 arm-elf/lib/interwork/rdimon.specs
@@ -109,10 +123,13 @@ arm-elf/lib/interwork/redboot.specs
 arm-elf/lib/iq80310.specs
 arm-elf/lib/libc.a
 arm-elf/lib/libg.a
+arm-elf/lib/libgloss-linux.a
 arm-elf/lib/libm.a
 arm-elf/lib/libnosys.a
 arm-elf/lib/librdimon.a
 arm-elf/lib/librdpmon.a
+arm-elf/lib/linux-crt0.o
+arm-elf/lib/linux.specs
 arm-elf/lib/pid.specs
 arm-elf/lib/rdimon-crt0.o
 arm-elf/lib/rdimon.specs
@@ -129,10 +146,13 @@ arm-elf/lib/thumb/interwork/crt0.o
 arm-elf/lib/thumb/interwork/iq80310.specs
 arm-elf/lib/thumb/interwork/libc.a
 arm-elf/lib/thumb/interwork/libg.a
+arm-elf/lib/thumb/interwork/libgloss-linux.a
 arm-elf/lib/thumb/interwork/libm.a
 arm-elf/lib/thumb/interwork/libnosys.a
 arm-elf/lib/thumb/interwork/librdimon.a
 arm-elf/lib/thumb/interwork/librdpmon.a
+arm-elf/lib/thumb/interwork/linux-crt0.o
+arm-elf/lib/thumb/interwork/linux.specs
 arm-elf/lib/thumb/interwork/pid.specs
 arm-elf/lib/thumb/interwork/rdimon-crt0.o
 arm-elf/lib/thumb/interwork/rdimon.specs
@@ -145,10 +165,13 @@ arm-elf/lib/thumb/interwork/redboot.specs
 arm-elf/lib/thumb/iq80310.specs
 arm-elf/lib/thumb/libc.a
 arm-elf/lib/thumb/libg.a
+arm-elf/lib/thumb/libgloss-linux.a
 arm-elf/lib/thumb/libm.a
 arm-elf/lib/thumb/libnosys.a
 arm-elf/lib/thumb/librdimon.a
 arm-elf/lib/thumb/librdpmon.a
+arm-elf/lib/thumb/linux-crt0.o
+arm-elf/lib/thumb/linux.specs
 arm-elf/lib/thumb/pid.specs
 arm-elf/lib/thumb/rdimon-crt0.o
 arm-elf/lib/thumb/rdimon.specs