diff --git a/ax25-tools-0.0.10-nrattach-fix.patch b/ax25-tools-0.0.10-nrattach-fix.patch
index 9a6efea..8a0ee32 100644
--- a/ax25-tools-0.0.10-nrattach-fix.patch
+++ b/ax25-tools-0.0.10-nrattach-fix.patch
@@ -13,3 +13,23 @@ index bd6cb58..c3a9e63 100644
  
  	printf("NET/ROM port %s bound to device %s\n", argv[optind], dev);
  		
+diff -Naur ax25-tools.orig/netrom/nrattach.c ax25-tools/netrom/nrattach.c
+--- ax25-tools.orig/netrom/nrattach.c	2005-11-28 14:14:48.000000000 -0600
++++ ax25-tools/netrom/nrattach.c	2015-09-18 08:20:11.718492511 -0500
+@@ -7,6 +7,7 @@
+ #include <signal.h>
+ #include <ctype.h>
+ #include <netdb.h>
++#include <limits.h>
+ 
+ #include <config.h>
+ 
+@@ -116,7 +117,7 @@
+ 		return FALSE;
+ 	}
+ 
+-	for (i = 0; i < 4; i++) {
++	for (i = 0; i < INT_MAX; i++) {
+ 		sprintf(dev, "nr%d", i);
+ 		strcpy(ifr.ifr_name, dev);
+ 	
diff --git a/ax25-tools.spec b/ax25-tools.spec
index cb9c993..cf74c75 100644
--- a/ax25-tools.spec
+++ b/ax25-tools.spec
@@ -1,8 +1,7 @@
 Name:		ax25-tools
 Version:	0.0.10
-Release:	0.13.rc2%{?dist}
+Release:	0.14.rc2%{?dist}
 Summary:	Tools used to configure an ax.25 enabled computer
-Group:		Applications/Communications
 License:	GPLv2+
 URL:		http://www.linux-ax25.org/wiki/LinuxAX25
 
@@ -29,8 +28,10 @@ BuildRequires:	libXt-devel
 BuildRequires:	libXi-devel
 BuildRequires:	fltk-devel
 BuildRequires:	libX11-devel
+BuildRequires:  mesa-libGL-devel
 BuildRequires:	desktop-file-utils
 
+
 %description
 ax25-tools is a collection of tools that are used to configure an ax.25 enabled
 computer. They will configure interfaces and assign callsigns to ports as well
@@ -74,10 +75,11 @@ line programs; the GUI programs are contained in ax25-tools-x package.
  * tcp_call - Make a TCP connection
  * yamcfg - configure a YAM interface
 
+
 %package x
 Summary:	X tools used to configure an AX.25 enabled computer
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description x
 ax25-tools-x is a collection of tools that are used to configure an ax.25 enabled
@@ -90,9 +92,9 @@ and sound modem.
  * xfsmdiag - kernel soundcard radio modem driver diagnostics utility
  * xfsmmixer - kernel soundcard radio modem driver mixer utility
 
+
 %package docs
 Summary:	Documentation for ax25-tools and ax25-tools-x
-Group:		Documentation
 
 %description docs
 ax25-tools is a collection of tools that are used to configure an ax.25 enabled
@@ -100,6 +102,7 @@ computer.  This package contains the GUI programs to configure Baycom modem
 and sound modem. This package contains the documentation for ax25-tools and
 ax25-tools-x
 
+
 %prep
 %setup -qn %{name}
 %patch0 -p1
@@ -107,13 +110,15 @@ ax25-tools-x
 %patch2 -p1 -b .build-fix
 %patch3 -p1 -b .rose-fix
 
+
 %build
 autoreconf -fiv
 %configure
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
+
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 # no upstream .desktop or icon yet so we'll use a temporary one
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
@@ -133,16 +138,25 @@ desktop-file-install	\
 #don't include these twice
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
 
+
 %files
 %doc AUTHORS ChangeLog COPYING README
 %doc yamdrv/README.yamdrv user_call/README.user_call tcpip/ttylinkd.README dmascc/README.dmascc
 %{_bindir}/*
 %{_sbindir}/*
+%exclude %{_bindir}/smdiag
+%exclude %{_sbindir}/xfhdlcchpar
+%exclude %{_sbindir}/xfhdlcst
+%exclude %{_sbindir}/xfsmdiag
+%exclude %{_sbindir}/xfsmmixer
 
 %files x
 %doc AUTHORS ChangeLog COPYING
-%{_bindir}/*
-%{_sbindir}/*
+%{_bindir}/smdiag
+%{_sbindir}/xfhdlcchpar
+%{_sbindir}/xfhdlcst
+%{_sbindir}/xfsmdiag
+%{_sbindir}/xfsmmixer
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*.desktop
 
@@ -150,7 +164,13 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
 %doc AUTHORS ChangeLog COPYING
 %{_mandir}/man?/*
 
+
 %changelog
+* Fri Sep 18 2015 Richard Shaw <hobbes1069@gmail.com> 0.0.10-0.14.rc2
+- Prevent duplicate binaries from being packaged, fixes BZ#1058070.
+- Add patch to allow more than 4 netrom ports, fixes BZ#1152001.
+- Spec file cleanup.
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.10-0.13.rc2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild