diff --git a/devel/arm-eabi-newlib30/Makefile b/_alpha/arm-eabi-newlib30/Makefile
similarity index 100%
rename from devel/arm-eabi-newlib30/Makefile
rename to _alpha/arm-eabi-newlib30/Makefile
diff --git a/devel/arm-eabi-newlib30/distinfo b/_alpha/arm-eabi-newlib30/distinfo
similarity index 100%
rename from devel/arm-eabi-newlib30/distinfo
rename to _alpha/arm-eabi-newlib30/distinfo
diff --git a/devel/arm-eabi-newlib25/files/patch-x-libgloss-arm-Makefile.in b/_alpha/arm-eabi-newlib30/files/patch-x-libgloss-arm-Makefile.in
similarity index 100%
rename from devel/arm-eabi-newlib25/files/patch-x-libgloss-arm-Makefile.in
rename to _alpha/arm-eabi-newlib30/files/patch-x-libgloss-arm-Makefile.in
diff --git a/devel/arm-eabi-newlib30/files/patch-x-newlib-libc-include-sys-types.h b/_alpha/arm-eabi-newlib30/files/patch-x-newlib-libc-include-sys-types.h
similarity index 100%
rename from devel/arm-eabi-newlib30/files/patch-x-newlib-libc-include-sys-types.h
rename to _alpha/arm-eabi-newlib30/files/patch-x-newlib-libc-include-sys-types.h
diff --git a/devel/arm-eabi-newlib25/pkg-descr b/_alpha/arm-eabi-newlib30/pkg-descr
similarity index 100%
rename from devel/arm-eabi-newlib25/pkg-descr
rename to _alpha/arm-eabi-newlib30/pkg-descr
diff --git a/devel/arm-eabi-newlib30/pkg-plist b/_alpha/arm-eabi-newlib30/pkg-plist
similarity index 100%
rename from devel/arm-eabi-newlib30/pkg-plist
rename to _alpha/arm-eabi-newlib30/pkg-plist
diff --git a/devel/arm-eabi-newlib25/Makefile b/devel/arm-eabi-newlib/Makefile
similarity index 98%
rename from devel/arm-eabi-newlib25/Makefile
rename to devel/arm-eabi-newlib/Makefile
index 8e0351c6..132ed8cb 100644
--- a/devel/arm-eabi-newlib25/Makefile
+++ b/devel/arm-eabi-newlib/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 PORTNAME=	newlib
-PORTVERSION=	2.5.0 #2.4.0
+PORTVERSION=	2.5.0
 CATEGORIES=	devel
 MASTER_SITES+=	http://mirrors.kernel.org/sources.redhat.com/newlib/
 MASTER_SITES+=	ftp://sourceware.org/pub/newlib/
diff --git a/devel/arm-eabi-newlib25/distinfo b/devel/arm-eabi-newlib/distinfo
similarity index 100%
rename from devel/arm-eabi-newlib25/distinfo
rename to devel/arm-eabi-newlib/distinfo
diff --git a/devel/arm-eabi-newlib30/files/patch-x-libgloss-arm-Makefile.in b/devel/arm-eabi-newlib/files/patch-x-libgloss-arm-Makefile.in
similarity index 100%
rename from devel/arm-eabi-newlib30/files/patch-x-libgloss-arm-Makefile.in
rename to devel/arm-eabi-newlib/files/patch-x-libgloss-arm-Makefile.in
diff --git a/devel/arm-eabi-newlib25/files/patch-x-newlib-libc-include-sys-types.h b/devel/arm-eabi-newlib/files/patch-x-newlib-libc-include-sys-types.h
similarity index 100%
rename from devel/arm-eabi-newlib25/files/patch-x-newlib-libc-include-sys-types.h
rename to devel/arm-eabi-newlib/files/patch-x-newlib-libc-include-sys-types.h
diff --git a/devel/arm-eabi-newlib30/pkg-descr b/devel/arm-eabi-newlib/pkg-descr
similarity index 100%
rename from devel/arm-eabi-newlib30/pkg-descr
rename to devel/arm-eabi-newlib/pkg-descr
diff --git a/devel/arm-eabi-newlib25/pkg-plist b/devel/arm-eabi-newlib/pkg-plist
similarity index 100%
rename from devel/arm-eabi-newlib25/pkg-plist
rename to devel/arm-eabi-newlib/pkg-plist
diff --git a/devel/libatomic_ops/pkg-plist b/devel/libatomic_ops/pkg-plist
index f5608f8c..2fa9a3f5 100644
--- a/devel/libatomic_ops/pkg-plist
+++ b/devel/libatomic_ops/pkg-plist
@@ -65,9 +65,7 @@ include/atomic_ops/sysdeps/sunc/x86.h
 include/atomic_ops/sysdeps/test_and_set_t_is_ao_t.h
 include/atomic_ops/sysdeps/test_and_set_t_is_char.h
 lib/libatomic_ops_gpl.a
-lib/libatomic_ops_gpl.la
 lib/libatomic_ops.a
-lib/libatomic_ops.la
 lib/pkgconfig/atomic_ops.pc
 @dir include/atomic_ops/sysdeps/armcc
 @dir include/atomic_ops/sysdeps/gcc
diff --git a/devel/libsass/pkg-plist b/devel/libsass/pkg-plist
index fcb44d69..7e01add3 100644
--- a/devel/libsass/pkg-plist
+++ b/devel/libsass/pkg-plist
@@ -6,7 +6,6 @@ include/sass/values.h
 include/sass/version.h
 include/sass2scss.h
 lib/libsass.a
-lib/libsass.la
 lib/libsass.so
 lib/libsass.so.0
 lib/pkgconfig/libsass.pc