diff --git a/sdcc-4.0.0-doc.patch b/sdcc-4.0.0-doc.patch
index a3620c8..76c30ae 100644
--- a/sdcc-4.0.0-doc.patch
+++ b/sdcc-4.0.0-doc.patch
@@ -106,10 +106,10 @@ index f4d3a96..8de83a5 100644
         y="928.34644"
         id="text3169"
 diff --git a/doc/Makefile.in b/doc/Makefile.in
-index 7ae6210..0fa7d1f 100644
+index 7ae6210..ca8e8ce 100644
 --- a/doc/Makefile.in
 +++ b/doc/Makefile.in
-@@ -29,26 +29,16 @@ install:
+@@ -29,25 +29,15 @@ install:
  uninstall:
  	rm -rf $(DESTDIR)$(docdir)
  
@@ -123,8 +123,8 @@ index 7ae6210..0fa7d1f 100644
 -	cp $(MANUAL).aux $(dir $@)
 +	cp $(MANUAL).aux sdcc_version.tex MCS51_named.eps $(dir $@)
  	-cd $(dir $@); $(LATEX2HTML) -split 5 -show_section_numbers -local_icons -info "" -nosubdir $(MANUAL) $(QUIET)
- 	rm -f $(dir $@)WARNINGS $(dir $@)labels.pl $(dir $@)$(notdir $<) $(dir $@)$*.aux
- 
+-	rm -f $(dir $@)WARNINGS $(dir $@)labels.pl $(dir $@)$(notdir $<) $(dir $@)$*.aux
+-
 -%.html/index.html: %.tex %.aux
 -	mkdir -p $(dir $@)
 -	@# fixes $(LATEX2HTML) problems with two consecutive dashes for long-options: --stack-auto
@@ -134,10 +134,10 @@ index 7ae6210..0fa7d1f 100644
 -	cp $*.aux $(dir $@)
 -	-cd $(dir $@); $(LATEX2HTML) -split 0 -local_icons -info "" -nosubdir $* $(QUIET)
 -	rm -f $(dir $@)WARNINGS $(dir $@)labels.pl $(dir $@)$(notdir $<) $(dir $@)$*.aux
--
++	rm -f $(dir $@)WARNINGS $(dir $@)labels.pl $(dir $@)$(notdir $<) $(dir $@)$*.aux $(dir $@)sdcc_version.* $(dir $@)MCS51_named.*
+ 
  %.txt: %.lyx
  	@# $(LYX) will export the file in the directory of the $(LYX) file
- 	@# if VPATH is used the $(LYX) file is copied first
 diff --git a/doc/sdccman.lyx b/doc/sdccman.lyx
 index d18a509..f724004 100644
 --- a/doc/sdccman.lyx
diff --git a/sdcc-4.0.0-pic16.patch b/sdcc-4.0.0-pic16.patch
new file mode 100644
index 0000000..b1f9411
--- /dev/null
+++ b/sdcc-4.0.0-pic16.patch
@@ -0,0 +1,48 @@
+diff --git a/device/lib/pic16/libc/stdlib/g_ftoa.S b/device/lib/pic16/libc/stdlib/g_ftoa.S
+index 1a11c45..9c8cc1c 100644
+--- a/device/lib/pic16/libc/stdlib/g_ftoa.S
++++ b/device/lib/pic16/libc/stdlib/g_ftoa.S
+@@ -52,9 +52,11 @@
+ 		include		<p18fxxx.inc>
+ 		list
+ 
++		extern	cvt_dec_word
++		global	_g_ftoa
++
+ 		udata
+ 
+-		extern	digits
+ 
+ exp:		res	1
+ man:		res	4
+@@ -66,8 +68,6 @@ ctr:		res	1
+ 
+ 		code
+ 
+-		extern	cvt_dec_word
+-		global	_g_ftoa
+ 
+ _g_ftoa:	movff	FSR2H,POSTDEC1
+ 		movff	FSR2L,POSTDEC1
+diff --git a/device/lib/pic16/libc/utils/cvtdec.S b/device/lib/pic16/libc/utils/cvtdec.S
+index 0e6fa42..30b9ab7 100644
+--- a/device/lib/pic16/libc/utils/cvtdec.S
++++ b/device/lib/pic16/libc/utils/cvtdec.S
+@@ -66,6 +66,9 @@
+ 		include	<p18fxxx.inc>
+ 		list
+ 
++	
++		global	cvt_dec_word
++
+ 		udata
+ 
+ 		global	digits
+@@ -74,7 +77,6 @@ digits:		res	6
+ 
+ 		code
+ 
+-		global	cvt_dec_word
+ 
+ ;--
+ ;
diff --git a/sdcc.spec b/sdcc.spec
index 962ff3e..0339c72 100644
--- a/sdcc.spec
+++ b/sdcc.spec
@@ -1,6 +1,6 @@
 Name:           sdcc
 Version:        4.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Small Device C Compiler
 License:        GPLv2+
 URL:            http://sdcc.sourceforge.net/
@@ -9,6 +9,7 @@ Source1:        README.fedora
 Source2:        sdcc-%{version}-lyx-preferences
 Patch1:         sdcc-%{version}-doc.patch
 Patch2:         sdcc-%{version}-python3.patch
+Patch3:         sdcc-%{version}-pic16.patch
 
 BuildRequires:  bison, gcc-c++, automake, libtool
 BuildRequires:  boost-devel zlib-devel
@@ -48,12 +49,13 @@ if you want to modify the C library or as reference of how it works.
 find -name '*.{c,h,cc}' -a -perm -a=x -exec chmod -a=x '{}' \;
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 # Disable brp-strip-static-archive for now because it errors trying to
 # strip foreign binaries.
 echo '%{__os_install_post}'
 %global __os_install_post %(echo '%{__os_install_post}' | 
-	sed -e 's#/usr/lib/rpm.*/brp-strip-static-archive .*##g' |
-	sed -e 's#/usr/lib/rpm.*/brp-strip-lto .*##g')
+        sed -e 's#/usr/lib/rpm.*/brp-strip-static-archive .*##g' |
+        sed -e 's#/usr/lib/rpm.*/brp-strip-lto .*##g')
 
 
 %build
@@ -111,6 +113,9 @@ popd
 
 
 %changelog
+* Mon May 04 2020 Roy Rankin <rrankin@ihug.com.au> - 4.0.0-2
+- patch for pic16 libs
+
 * Mon Apr 27 2020 Roy Rankin <rrankin@ihug.com.au> - 4.0.0-1
 - Upstream release, patch doc build and inkscape 1 changes