diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index f608daac7b6..474d1bbc8e9 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -2,6 +2,7 @@ COMMENT =	GNU binary utilities
 
 DISTNAME =	binutils-2.40
 EXTRACT_SUFX =	.tar.bz2
+REVISION =	0
 
 CATEGORIES =	devel
 
@@ -20,8 +21,7 @@ MASTER_SITES =	${MASTER_SITE_GNU:=binutils/}
 
 CONFIGURE_STYLE =	gnu
 
-CONFIGURE_ARGS +=	--disable-gas \
-			--disable-gprof \
+CONFIGURE_ARGS +=	--disable-gprof \
 			--disable-ld \
 			--disable-libctf \
 			--disable-nls \
diff --git a/devel/binutils/patches/patch-gas_configure_tgt b/devel/binutils/patches/patch-gas_configure_tgt
new file mode 100644
index 00000000000..16477c0c8d4
--- /dev/null
+++ b/devel/binutils/patches/patch-gas_configure_tgt
@@ -0,0 +1,14 @@
+Add OpenBSD ARM GAS support.
+
+Index: gas/configure.tgt
+--- gas/configure.tgt.orig
++++ gas/configure.tgt
+@@ -159,7 +159,7 @@ case ${generic_target} in
+   arm-*-uclinux*eabi*)			fmt=elf  em=armlinuxeabi ;;
+   arm-*-uclinux*)			fmt=elf  em=linux ;;
+   arm-*-nacl*)				fmt=elf  em=nacl ;;
+-  arm-*-netbsd*)			fmt=elf  em=nbsd ;;
++  arm-*-netbsd* | arm-*-openbsd*)	fmt=elf  em=nbsd ;;
+   arm-*-nto*)				fmt=elf ;;
+   arm-wince-pe | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)
+ 					fmt=coff em=wince-pe ;;
diff --git a/devel/binutils/pkg/PLIST b/devel/binutils/pkg/PLIST
index 3776007ed9f..6be4c9fde81 100644
--- a/devel/binutils/pkg/PLIST
+++ b/devel/binutils/pkg/PLIST
@@ -1,5 +1,7 @@
+@conflict gas-*
 @bin bin/gaddr2line
 @bin bin/gar
+@bin bin/gas
 @bin bin/gc++filt
 @bin bin/gelfedit
 @bin bin/gnm
@@ -10,10 +12,12 @@
 @bin bin/gsize
 @bin bin/gstrings
 @bin bin/gstrip
+@info info/as.info
 @info info/binutils.info
 @info info/sframe-spec.info
 @man man/man1/gaddr2line.1
 @man man/man1/gar.1
+@man man/man1/gas.1
 @man man/man1/gc++filt.1
 @comment @man man/man1/gdlltool.1
 @man man/man1/gelfedit.1