diff --git a/.gitignore b/.gitignore
index 4299303..abab04c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 catdoc-0.94.2.tar.gz
+/catdoc-0.95.tar.gz
diff --git a/catdoc-0.94.2-bufferoverflow-rh872390-rh872391.patch b/catdoc-0.94.2-bufferoverflow-rh872390-rh872391.patch
deleted file mode 100644
index 0a272da..0000000
--- a/catdoc-0.94.2-bufferoverflow-rh872390-rh872391.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru catdoc-0.94.2.orign/src/xlsparse.c catdoc-0.94.2/src/xlsparse.c
---- catdoc-0.94.2.orign/src/xlsparse.c	2006-02-24 18:44:06.000000000 +0100
-+++ catdoc-0.94.2/src/xlsparse.c	2012-11-02 11:01:42.675639679 +0100
-@@ -584,8 +584,9 @@
- 
- void CleanUpFormatIdxUsed() {
- 	int i;
--	for (i=0;i<NUMOFDATEFORMATS; i++);
--	FormatIdxUsed[i]=0;
-+	for (i=0;i<NUMOFDATEFORMATS; i++) {
-+		FormatIdxUsed[i]=0;
-+	}
- }
- 
- /* 
diff --git a/catdoc-0.94.2-cflags.patch b/catdoc-0.94.2-cflags.patch
deleted file mode 100644
index 31850ce..0000000
--- a/catdoc-0.94.2-cflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur a/configure.in b/configure.in
---- a/configure.in	2006-02-25 09:28:12.000000000 -0600
-+++ b/configure.in	2015-06-17 01:53:55.853668208 -0500
-@@ -100,10 +100,6 @@
- dnl Checks for library functions.
- AC_FUNC_SETVBUF_REVERSED
- 
--if test "$GCC" = "yes"; then
--	CFLAGS="-g -O2 -Wall"
--fi
--
- AC_DEFINE_UNQUOTED([SOURCE_CHARSET],"$sourcecharset",[Character encoding used by default for 8-bit source files])
- AC_DEFINE_UNQUOTED([TARGET_CHARSET],"$targetcharset",[Output character encoding used by default, if impossible to determine encoding from locale])
- AC_DEFINE_UNQUOTED([SPEC_EXT],"$specsuffix",[Suffix for files with special symbols map (ones to be replaced regardless of availability in target encoding)])
-diff -ur a/configure b/configure
---- a/configure	2006-02-25 10:05:57.000000000 -0600
-+++ b/configure	2015-06-17 01:54:48.185563035 -0500
-@@ -1499,10 +1499,6 @@
- fi
- 
- 
--if test "$GCC" = "yes"; then
--	CFLAGS="-g -O2 -Wall"
--fi
--
- cat >> confdefs.h <<EOF
- #define SOURCE_CHARSET "$sourcecharset"
- EOF
diff --git a/catdoc.spec b/catdoc.spec
index 3ea1fe9..3311ee4 100644
--- a/catdoc.spec
+++ b/catdoc.spec
@@ -1,18 +1,11 @@
 Name: catdoc
-Version: 0.94.2
-Release: 18%{?dist}
-Summary: A program which converts Microsoft office files to plain text        
-
-Group: Applications/Text   
-License: GPL+       
-URL: http://www.wagner.pp.ru/~vitus/software/catdoc/           
-Source0: http://ftp.wagner.pp.ru/pub/catdoc/%{name}-%{version}.tar.gz      
+Version: 0.95
+Release: 1%{?dist}
+Summary: A program which converts Microsoft office files to plain text
+License: GPL+
+URL: http://www.wagner.pp.ru/~vitus/software/catdoc/
+Source0: http://ftp.wagner.pp.ru/pub/catdoc/%{name}-%{version}.tar.gz
 Patch0: makefilefix.patch
-Patch1: catdoc-0.94.2-bufferoverflow-rh872390-rh872391.patch
-Patch2: catdoc-0.94.2-cflags.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-
 BuildRequires: tk
 Requires: tk
 
@@ -29,25 +22,16 @@ from Powerpoint files
 %prep
 %setup -q
 %patch0 -p1 -b .makefilefix
-%patch1 -p1 -b .bufferoverflow
-%patch2 -p1 -b .cflags
 
 %build
 %configure
 make %{?_smp_mflags}
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
+%license COPYING
 %{_bindir}/catdoc
 %{_bindir}/catppt
 %{_bindir}/wordview
@@ -57,11 +41,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/wordview.1.*
 %{_mandir}/man1/xls2csv.1.*
 %{_datadir}/catdoc
-%doc COPYING README NEWS
-
-
+%doc README NEWS
 
 %changelog
+* Tue Jun 20 2017 Tom Callaway <spot@fedoraproject.org> - 0.95-1
+- update to 0.95, resolves licensing issue (bz1295166)
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.94.2-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/makefilefix.patch b/makefilefix.patch
index c1d781d..98309b4 100644
--- a/makefilefix.patch
+++ b/makefilefix.patch
@@ -1,7 +1,7 @@
-diff -upNr catdoc-0.94.2.orign/charsets/Makefile.in catdoc-0.94.2/charsets/Makefile.in
---- catdoc-0.94.2.orign/charsets/Makefile.in	2006-02-24 18:44:06.000000000 +0100
-+++ catdoc-0.94.2/charsets/Makefile.in	2007-11-11 10:24:47.000000000 +0100
-@@ -29,15 +29,15 @@ all: @charsetcheck@
+diff -up catdoc-0.95/charsets/Makefile.in.makefilefix catdoc-0.95/charsets/Makefile.in
+--- catdoc-0.95/charsets/Makefile.in.makefilefix	2016-04-26 11:13:38.000000000 -0400
++++ catdoc-0.95/charsets/Makefile.in	2017-06-20 14:17:55.494732868 -0400
+@@ -30,15 +30,15 @@ all: @charsetcheck@
  clean:
  install: install-dirs install-spc install-charsets
  install-spc: tex.spc ascii.spc tex.rpl ascii.rpl
@@ -23,42 +23,33 @@ diff -upNr catdoc-0.94.2.orign/charsets/Makefile.in catdoc-0.94.2/charsets/Makef
 +	../mkinstalldirs $(DESTDIR)$(installroot)$(LIB_DIR)
  distclean:
  	rm Makefile
-diff -upNr catdoc-0.94.2.orign/doc/Makefile.in catdoc-0.94.2/doc/Makefile.in
---- catdoc-0.94.2.orign/doc/Makefile.in	2006-02-25 17:08:27.000000000 +0100
-+++ catdoc-0.94.2/doc/Makefile.in	2007-11-11 10:24:49.000000000 +0100
-@@ -10,7 +10,7 @@ prefix = @prefix@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
- libdir = @libdir@
--mandir = @man1dir@
-+mandir = @mandir@
- manext = @manext@ 
- %.txt: %.1
- 	nroff -mandoc $< |col -bx >$@
-@@ -25,13 +25,13 @@ clean:
- 	rm build
+diff -up catdoc-0.95/doc/Makefile.in.makefilefix catdoc-0.95/doc/Makefile.in
+--- catdoc-0.95/doc/Makefile.in.makefilefix	2017-06-20 14:17:55.494732868 -0400
++++ catdoc-0.95/doc/Makefile.in	2017-06-20 14:20:00.266641962 -0400
+@@ -30,13 +30,13 @@ clean:
+             wordview.txt wordview.ps build
  install: @installtargets@
  install-catdoc: catdoc.1 xls2csv.1 catppt.1
 -	../mkinstalldirs $(installroot)$(mandir)
--	$(INSTALL) -m 644 catdoc.1 $(installroot)$(mandir)/catdoc$(manext)
--	$(INSTALL) -m 644 xls2csv.1 $(installroot)$(mandir)/xls2csv$(manext)
--	$(INSTALL) -m 644 catppt.1 $(installroot)$(mandir)/catppt$(manext)
+-	$(INSTALL) -m 644 catdoc.1 $(installroot)$(mandir)/man1/catdoc.1
+-	$(INSTALL) -m 644 xls2csv.1 $(installroot)$(mandir)/man1/xls2csv.1
+-	$(INSTALL) -m 644 catppt.1 $(installroot)$(mandir)/man1/catppt.1
 +	../mkinstalldirs $(DESTDIR)$(installroot)$(mandir)/man1/
-+	$(INSTALL) -p -m 644 catdoc.1 $(DESTDIR)$(installroot)$(mandir)/man1/catdoc$(manext)
-+	$(INSTALL) -p -m 644 xls2csv.1 $(DESTDIR)$(installroot)$(mandir)/man1/xls2csv$(manext)
-+	$(INSTALL) -p -m 644 catppt.1 $(DESTDIR)$(installroot)$(mandir)//man1/catppt$(manext)
++	$(INSTALL) -m 644 catdoc.1 $(DESTDIR)$(installroot)$(mandir)/man1/catdoc.1
++	$(INSTALL) -m 644 xls2csv.1 $(DESTDIR)$(installroot)$(mandir)/man1/xls2csv.1
++	$(INSTALL) -m 644 catppt.1 $(DESTDIR)$(installroot)$(mandir)/man1/catppt.1
  install-wordview:	
 -	../mkinstalldirs $(installroot)$(mandir)
--	$(INSTALL) -m 644 wordview.1 $(installroot)$(mandir)/wordview$(manext)
+-	$(INSTALL) -m 644 wordview.1 $(installroot)$(mandir)/man1/wordview.1
 +	../mkinstalldirs $(DESTDIR)$(installroot)$(mandir)
-+	$(INSTALL) -p -m 644 wordview.1 $(DESTDIR)$(installroot)$(mandir)/man1/wordview$(manext)
- # Following rules are primarily for developers use. I doubt that you
- # need to rebuild these versions of documentation
- distclean: catppt.txt catppt.ps catdoc.1 catdoc.txt catdoc.ps xls2csv.1  xls2csv.txt xls2csv.ps
-diff -upNr catdoc-0.94.2.orign/src/Makefile.in catdoc-0.94.2/src/Makefile.in
---- catdoc-0.94.2.orign/src/Makefile.in	2006-02-24 18:44:06.000000000 +0100
-+++ catdoc-0.94.2/src/Makefile.in	2007-11-11 10:25:03.000000000 +0100
-@@ -83,13 +83,13 @@ catppt: $(OBJPPT)
++	$(INSTALL) -m 644 wordview.1 $(DESTDIR)$(installroot)$(mandir)/man1/wordview.1
+ distclean: clean
+ 	$(RM)  Makefile catdoc.1 xls2csv.1 catppt.1 wordview.1
+ 
+diff -up catdoc-0.95/src/Makefile.in.makefilefix catdoc-0.95/src/Makefile.in
+--- catdoc-0.95/src/Makefile.in.makefilefix	2016-04-26 11:13:38.000000000 -0400
++++ catdoc-0.95/src/Makefile.in	2017-06-20 14:17:55.494732868 -0400
+@@ -84,13 +84,13 @@ catppt: $(OBJPPT)
  
  install: @installtargets@
  install-catdoc:catdoc xls2csv catppt 
diff --git a/sources b/sources
index 951eca3..72c4b9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-243e1680bb3e703616f5adecfee24491  catdoc-0.94.2.tar.gz
+SHA512 (catdoc-0.95.tar.gz) = dd6bded4b6b70749c007256b182b063ff266f86d53024d8582001678821e8096c5b980bc8f43015d9c82bbe022d71d4ba5fe68aff31b2ff6db3688595e651b2c